diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-23 13:46:50 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-24 17:33:13 -0400 |
| commit | ebdc4419310d2c6fe901ed7c7355a344b87dadeb (patch) | |
| tree | a421545aede4644c2043183374ba34df76433b83 /pkgs/development/libraries | |
| parent | cb99f4f23a2b36fdaeb0f5d7ea8ade675b47bcb8 (diff) | |
gmp: don’t disable assembly on x86
this should always work, even on android / iOS toolchains (cherry picked from commit 699fae259deb8ee121fc9e539e71285d60666126) (cherry picked from commit a5771ef41a199c76b9783b9965bd059570794be1)
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/gmp/6.x.nix | 2 |
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 ce78f32308824..dc2f8aeadbd3b 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -36,7 +36,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; |