From 09c3fb055e4624d600eaa061617230fdd10ee98d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 14 Jun 2018 15:44:26 -0400 Subject: [PATCH] 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 --- pkgs/development/libraries/gmp/6.x.nix | 6 +++--- 1 file 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 , 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 ]; };