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

cc-wrapper: fixup branch interactions

Browse Source 
c0599fdd61c and changes on closure-size didn't go well together.
This commit is contained in:
Vladimír Čunát 2016-02-01 14:42:33 +01:00
parent ae74c356d9
commit f89a136fd5
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/cc-wrapper/cc-wrapper.sh
View File

@ -1,7 +1,7 @@
#! @shell@ -e #! @shell@ -e
path_backup="$PATH" path_backup="$PATH"
if [ -n "@coreutils@" ]; then if [ -n "@coreutils_bin@" ]; then
PATH="@coreutils@/bin:@gnugrep@/bin" PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin"
fi fi
if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then

2
pkgs/build-support/cc-wrapper/default.nix
View File

@ -44,7 +44,7 @@ stdenv.mkDerivation {
preferLocalBuild = true; preferLocalBuild = true;
inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin; inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin;
gnugrep = if nativeTools then "" else gnugrep; gnugrep_bin = if nativeTools then "" else gnugrep;
passthru = { inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; }; passthru = { inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; };

4
pkgs/build-support/cc-wrapper/gnat-wrapper.sh
View File

@ -1,7 +1,7 @@
#! @shell@ -e #! @shell@ -e
path_backup="$PATH" path_backup="$PATH"
if [ -n "@coreutils@" ]; then if [ -n "@coreutils_bin@" ]; then
PATH="@coreutils@/bin" PATH="@coreutils_bin@/bin"
fi fi
if [ -n "$NIX_GNAT_WRAPPER_START_HOOK" ]; then if [ -n "$NIX_GNAT_WRAPPER_START_HOOK" ]; then

4
pkgs/build-support/cc-wrapper/ld-wrapper.sh
View File

@ -1,7 +1,7 @@
#! @shell@ -e #! @shell@ -e
path_backup="$PATH" path_backup="$PATH"
if [ -n "@coreutils@" ]; then if [ -n "@coreutils_bin@" ]; then
PATH="@coreutils@/bin" PATH="@coreutils_bin@/bin"
fi fi
if [ -n "$NIX_LD_WRAPPER_START_HOOK" ]; then if [ -n "$NIX_LD_WRAPPER_START_HOOK" ]; then