summary refs log tree commit diff
path: root/pkgs/development/libraries/gmp
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-06-14 15:44:26 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2018-06-14 15:54:20 -0400
commit09c3fb055e4624d600eaa061617230fdd10ee98d (patch)
tree5b92bbe2d0b065f499869303fc1f20b4116a2272 /pkgs/development/libraries/gmp
parenta87b177be9aeb74f1b893a8aff98edda5320e119 (diff)
downloadnixpkgs-09c3fb055e4624d600eaa061617230fdd10ee98d.tar
nixpkgs-09c3fb055e4624d600eaa061617230fdd10ee98d.tar.gz
nixpkgs-09c3fb055e4624d600eaa061617230fdd10ee98d.tar.bz2
nixpkgs-09c3fb055e4624d600eaa061617230fdd10ee98d.tar.lz
nixpkgs-09c3fb055e4624d600eaa061617230fdd10ee98d.tar.xz
nixpkgs-09c3fb055e4624d600eaa061617230fdd10ee98d.tar.zst
nixpkgs-09c3fb055e4624d600eaa061617230fdd10ee98d.zip
gmp: fix mobile gmp prebuilt building
The prebuilt was previously broken in building GMP. We add a
--disable-assembly flag to put get GMP to avoid pulling in assembly
stuff that breaks.

/cc @ericson2314
Diffstat (limited to 'pkgs/development/libraries/gmp')
-rw-r--r--pkgs/development/libraries/gmp/6.x.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 2635aed3eac..cb2c3f15da8 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -27,12 +27,13 @@ let self = stdenv.mkDerivation rec {
     # See <http://hydra.nixos.org/build/2760931>, for instance.
     #
     # no darwin because gmp uses ASM that clang doesn't like
-    optional (!stdenv.isSunOS) "--enable-fat"
+    optional (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "--enable-fat"
     ++ (if cxx then [ "--enable-cxx"  ]
                else [ "--disable-cxx" ])
     ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
-    ++ optional stdenv.isDarwin "ABI=64"
+    ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64"
     ++ optional stdenv.is64bit "--with-pic"
+    ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly"
     ;
 
   # The config.guess in GMP tries to runtime-detect various
@@ -75,7 +76,6 @@ let self = stdenv.mkDerivation rec {
          asymptotically faster algorithms.
       '';
 
-    broken = with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt;
     platforms = platforms.all;
     maintainers = [ maintainers.peti maintainers.vrthra ];
   };