diff options
author | Marius Bakke <marius@gnu.org> | 2020-06-08 19:05:56 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-06-08 19:05:56 +0200 |
commit | dd2d3ed2d30b5d705f9ed8695ab3171c29469f76 (patch) | |
tree | 22e909cfe9de99fab471621a907b9f87045bb3bd /gnu/packages/make-bootstrap.scm | |
parent | 24b61fb8ea8a9e8c5320d1db1447f9b62ad04b3d (diff) | |
parent | 1fd2c00efbe701a81d86c254d5f4f285e63c1cde (diff) | |
download | guix-dd2d3ed2d30b5d705f9ed8695ab3171c29469f76.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/make-bootstrap.scm')
-rw-r--r-- | gnu/packages/make-bootstrap.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index fe86f810bf..b2d3e2a326 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -706,7 +706,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; When `configure' checks for ltdl availability, it ;; doesn't try to link using libtool, and thus fails ;; because of a missing -ldl. Work around that. - ''("LDFLAGS=-ldl")) + + ;; XXX: On ARMv7, disable JIT: it causes crashes with 3.0.2, + ;; possibly related to <https://bugs.gnu.org/40737>. + (if (target-arm32?) + ''("LDFLAGS=-ldl" "--disable-jit") + ''("LDFLAGS=-ldl"))) ((#:phases phases '%standard-phases) `(modify-phases ,phases |