Skip to content

Commit

Permalink
gmp: don’t disable assembly on x86
Browse files Browse the repository at this point in the history
this should always work, even on android / iOS toolchains

(cherry picked from commit 699fae2)
(cherry picked from commit a5771ef)
  • Loading branch information
matthewbauer committed Sep 24, 2019
1 parent cb99f4f commit ebdc441
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkgs/development/libraries/gmp/6.x.nix
Expand Up @@ -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;
Expand Down

0 comments on commit ebdc441

Please sign in to comment.