stdenv-linux: Ensure binutils comes before bootstrapTools in $PATH

Otherwise, when building glibc and other packages, the "strip" from
bootstrapTools is used, which doesn't recognise some tags produced by
the newer "ld" from binutils.
This commit is contained in:
Eelco Dolstra
2016-02-28 01:13:15 +01:00
parent 559ecc9212
commit 2040a9ac57
2 changed files with 10 additions and 18 deletions
+6 -6
View File
@@ -22,20 +22,20 @@ envHooks+=(addCVars)
# Note: these come *after* $out in the PATH (see setup.sh).
if [ -n "@cc@" ]; then
addToSearchPath PATH @cc@/bin
if [ -n "@binutils@" ]; then
addToSearchPath _PATH @binutils@/bin
fi
if [ -n "@binutils@" ]; then
addToSearchPath PATH @binutils@/bin
if [ -n "@cc@" ]; then
addToSearchPath _PATH @cc@/bin
fi
if [ -n "@libc@" ]; then
addToSearchPath PATH @libc@/bin
addToSearchPath _PATH @libc@/bin
fi
if [ -n "@coreutils@" ]; then
addToSearchPath PATH @coreutils@/bin
addToSearchPath _PATH @coreutils@/bin
fi
if [ -z "$crossConfig" ]; then