diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-09 17:08:41 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-09 17:08:41 +0000 |
| commit | b8b4f9ce4b44e22308d6bac476c78a5639863610 (patch) | |
| tree | f0bbafc00a0c1cf18a165ffe830fb51814e079d3 /pkgs/build-support/gcc-wrapper/setup-hook.sh | |
| parent | d74192ee389df646868c0f659b4392d85c75fb06 (diff) | |
* Reject inputs outside of the store in ld if NIX_ENFORCE_PURITY is
set. * Various bug fixes. svn path=/nixpkgs/trunk/; revision=824
Diffstat (limited to 'pkgs/build-support/gcc-wrapper/setup-hook.sh')
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/setup-hook.sh | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/build-support/gcc-wrapper/setup-hook.sh b/pkgs/build-support/gcc-wrapper/setup-hook.sh index cc20c5f948296..4385ab0602ba1 100644 --- a/pkgs/build-support/gcc-wrapper/setup-hook.sh +++ b/pkgs/build-support/gcc-wrapper/setup-hook.sh @@ -11,8 +11,18 @@ addCVars () { envHooks=(${envHooks[@]} addCVars) export NIX_IS_NATIVE=@isNative@ -if test -z "$NIX_IS_NATIVE"; then - PATH=$PATH:@gcc@/bin:@glibc@/bin +export NIX_ENFORCE_PURITY=@enforcePurity@ + +# Note: these come *after* $out in the PATH (see setup.sh). + +if test -n "@gcc@"; then + PATH=$PATH:@gcc@/bin fi -export NIX_ENFORCE_PURITY=@enforcePurity@ +if test -n "@binutils@"; then + PATH=$PATH:@binutils@/bin +fi + +if test -n "@glibc@"; then + PATH=$PATH:@glibc@/bin +fi |