diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
commit | ab15a62c68bf7bf3b02e3bab00d121cc1426733c (patch) | |
tree | 398a82403b04bfa0bae8cadf1c5a64cf83145965 /pkgs/build-support/cc-wrapper/setup-hook.sh | |
parent | c643ccaa8c91f78b8c89eb87589886b8906d5b38 (diff) | |
parent | a26357eefe017964448b5bb464163646b927a267 (diff) | |
download | nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.gz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.bz2 nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.lz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.xz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.zst nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.zip |
Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
Diffstat (limited to 'pkgs/build-support/cc-wrapper/setup-hook.sh')
-rw-r--r-- | pkgs/build-support/cc-wrapper/setup-hook.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index d8fb88b41d18..f4f7ab181d3e 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -23,19 +23,19 @@ envHooks+=(addCVars) # Note: these come *after* $out in the PATH (see setup.sh). if [ -n "@cc@" ]; then - addToSearchPath PATH @cc@/bin + addToSearchPath _PATH @cc@/bin fi if [ -n "@binutils_bin@" ]; then - addToSearchPath PATH @binutils_bin@/bin + addToSearchPath _PATH @binutils_bin@/bin fi if [ -n "@libc_bin@" ]; then - addToSearchPath PATH @libc_bin@/bin + addToSearchPath _PATH @libc_bin@/bin fi if [ -n "@coreutils_bin@" ]; then - addToSearchPath PATH @coreutils_bin@/bin + addToSearchPath _PATH @coreutils_bin@/bin fi if [ -z "$crossConfig" ]; then |