From eebd455dc0bcc9f0d4fc8372811611ba3af18bcd Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 6 May 2018 14:59:50 -0400 Subject: [PATCH] linux stdenv: Update gnu-config on all non-x86 Not just Aarch64. Other non-x86 platforms might be old enough, but I am about to update gnu-config to handle things better across the board. --- pkgs/stdenv/linux/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 9e19d199a5d..63b4c8ecc24 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -255,7 +255,7 @@ in }; extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. - lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook; + lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook; }) @@ -297,7 +297,7 @@ in }; extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. - lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook; + lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook; }) # Construct the final stdenv. It uses the Glibc and GCC, and adds @@ -327,7 +327,7 @@ in extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. - lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook; + lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook; cc = prevStage.gcc; @@ -361,7 +361,7 @@ in binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params ] ++ lib.optional (localSystem.libc == "musl") libiconv - ++ lib.optionals localSystem.isAarch64 + ++ lib.optionals (!localSystem.isx86) [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]; overrides = self: super: {