Merge commit '36f316007494c388df1fec434c1e658542e3c3cc'

2 files changed, 8 insertions, 14 deletions

diff --git a/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix b/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix
index 3b9fbc35a768..00bfb55520dc 100644
--- a/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/gmp/6.x.nix b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix
index 23a69282b41c..ce78f3230882 100644
--- a/nixpkgs/pkgs/development/libraries/gmp/6.x.nix
+++ b/nixpkgs/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;