diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2018-11-29 18:52:55 -0500 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2019-01-04 22:21:59 -0500 |
| commit | 3e948470227c0c5cf92b587da5d66236d336d884 (patch) | |
| tree | 0447d339c3d5b39c1bc1e561f3aca84744ea1634 /pkgs/development/libraries/gmp | |
| parent | aca57f1aed4068ee374d51b211844972dcb0192f (diff) | |
gmp: don't infer build platform from uname
Diffstat (limited to 'pkgs/development/libraries/gmp')
| -rw-r--r-- | pkgs/development/libraries/gmp/5.1.x.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/gmp/6.x.nix | 11 |
2 files changed, 8 insertions, 14 deletions
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 3b9fbc35a768f..00bfb55520dca 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -29,17 +29,14 @@ let self = stdenv.mkDerivation rec { # # no darwin because gmp uses ASM that clang doesn't like (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + # The config.guess in GMP tries to runtime-detect various + # ARM optimization flags via /proc/cpuinfo (and is also + # broken on multicore CPUs). Avoid this impurity. + "--build=${stdenv.buildPlatform.config}" ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" ; - # The config.guess in GMP tries to runtime-detect various - # ARM optimization flags via /proc/cpuinfo (and is also - # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isAarch32 '' - configureFlagsArray+=("--build=$(./configfsf.guess)") - ''; - doCheck = true; dontDisableStatic = withStatic; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 23a69282b41c5..ce78f32308824 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -30,18 +30,15 @@ let self = stdenv.mkDerivation rec { # # no darwin because gmp uses ASM that clang doesn't like (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + # The config.guess in GMP tries to runtime-detect various + # ARM optimization flags via /proc/cpuinfo (and is also + # broken on multicore CPUs). Avoid this impurity. + "--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" ; - # The config.guess in GMP tries to runtime-detect various - # ARM optimization flags via /proc/cpuinfo (and is also - # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isAarch32 '' - configureFlagsArray+=("--build=$(./configfsf.guess)") - ''; - doCheck = true; # not cross; dontDisableStatic = withStatic; |