Merge pull request #68400 from angerman/feature/fix-gmp

[gmp] Fix shared windows cross compilation
This commit is contained in:
Matthew Bauer 2019-12-22 12:56:32 -06:00 committed by GitHub
commit 24f38780dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -37,7 +37,9 @@ 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) && !isx86) "--disable-assembly"
# to build a .dll on windows, we need --disable-static + --enable-shared
# see https://gmplib.org/manual/Notes-for-Particular-Systems.html
++ optional (!withStatic && stdenv.hostPlatform.isWindows) "--disable-static --enable-shared"
;
doCheck = true; # not cross;