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

Merge pull request #40040 from obsidiansystems/gnu-config-arm

Browse Source 
gnu-config: Update, allowing hacks to be removed
This commit is contained in:
John Ericson
2018-05-14 11:20:09 -04:00
committed by GitHub
parent 8e891e6ed4 f2b575bd7b
commit d00cc1242f
10 changed files with 15 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/linux/default.nix
+4 -4
View File
@@ -249,7 +249,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;
})
@@ -290,7 +290,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
@@ -322,7 +322,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;
@@ -356,7 +356,7 @@ in
++ [ /*propagated from .dev*/ linuxHeaders
binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params
]
++ lib.optionals localSystem.isAarch64
++ lib.optionals (!localSystem.isx86)
[ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ];
overrides = self: super: {