nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 16:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

gmp: don’t disable assembly on x86

Browse Source 
this should always work, even on android / iOS toolchains

(cherry picked from commit 699fae259d)
(cherry picked from commit a5771ef41a)
This commit is contained in:
Matthew Bauer
2019-09-23 13:46:50 -04:00
parent cb99f4f23a
commit ebdc441931
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/gmp/6.x.nix
View File

@@ -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;