JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gmp: fix mobile gmp prebuilt building

Browse Source 
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
This commit is contained in:
Matthew Bauer 2018-06-14 15:44:26 -04:00
parent a87b177be9
commit 09c3fb055e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,12 +27,13 @@ let self = stdenv.mkDerivation rec {
# See <http://hydra.nixos.org/build/2760931>, for instance. # See <http://hydra.nixos.org/build/2760931>, for instance.
# #
# no darwin because gmp uses ASM that clang doesn't like # 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" ] ++ (if cxx then [ "--enable-cxx" ]
else [ "--disable-cxx" ]) else [ "--disable-cxx" ])
++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
++ optional stdenv.isDarwin "ABI=64" ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64"
++ optional stdenv.is64bit "--with-pic" ++ optional stdenv.is64bit "--with-pic"
++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly"
; ;
# The config.guess in GMP tries to runtime-detect various # The config.guess in GMP tries to runtime-detect various
@ -75,7 +76,6 @@ let self = stdenv.mkDerivation rec {
asymptotically faster algorithms. asymptotically faster algorithms.
''; '';
broken = with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt;
platforms = platforms.all; platforms = platforms.all;
maintainers = [ maintainers.peti maintainers.vrthra ]; maintainers = [ maintainers.peti maintainers.vrthra ];
}; };