From 2040a9ac574fffd36fe20130897ccec2d5928827 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 28 Feb 2016 01:13:15 +0100 Subject: 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. --- pkgs/build-support/cc-wrapper/setup-hook.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/build-support/cc-wrapper/setup-hook.sh') diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 3d0b2fdfe8ae..35620483d2bc 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -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 -- cgit 1.4.1