MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cc-wrapper: fixup branch interactions

Browse source 
c0599fdd61 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
path_backup="$PATH"
if [ -n "@coreutils@" ]; then
PATH="@coreutils@/bin:@gnugrep@/bin"
if [ -n "@coreutils_bin@" ]; then
PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin"
fi
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;
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; };

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

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