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

linux stdenv: Update gnu-config on all non-x86

Browse Source 
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.
This commit is contained in:
John Ericson
2018-05-14 10:55:32 -04:00
parent 29ef982af4
commit eebd455dc0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/linux/default.nix
+4 -4
View File
@@ -255,7 +255,7 @@ in
}; };
extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. # 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 ] ++ extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. # 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 # Construct the final stdenv. It uses the Glibc and GCC, and adds
@@ -327,7 +327,7 @@ in
extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. # 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; cc = prevStage.gcc;
@@ -361,7 +361,7 @@ in
binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params
] ]
++ lib.optional (localSystem.libc == "musl") libiconv ++ lib.optional (localSystem.libc == "musl") libiconv
++ lib.optionals localSystem.isAarch64 ++ lib.optionals (!localSystem.isx86)
[ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]; [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ];
overrides = self: super: { overrides = self: super: {