aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-09-23 13:46:50 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2019-09-23 13:46:50 -0400
commit699fae259deb8ee121fc9e539e71285d60666126 (patch)
tree6ec43ae70d131c45bf8b5bd70c3cf4dee606ec33
parentf089afe96539f90c24cdba9005e689d410a24e93 (diff)
gmp: don’t disable assembly on x86
this should always work, even on android / iOS toolchains
-rw-r--r--pkgs/development/libraries/gmp/6.x.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index de31128e5a6..d9ea5a71dd3 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -37,7 +37,7 @@ let self = stdenv.mkDerivation rec {
"--build=${stdenv.buildPlatform.config}"
] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64"
- ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly"
+ ++ optional (with stdenv.hostPlatform; (useAndroidPrebuilt || useiOSPrebuilt) && !isx86) "--disable-assembly"
;
doCheck = true; # not cross;