diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-13 19:41:37 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-13 19:41:37 +0000 |
commit | 89815eb9a00150c34edcc5872bbc93b9122decdc (patch) | |
tree | de371da01f88392d8e0e2ec99fa66abbbb1cc388 /pkgs/stdenv/generic | |
parent | 908d8286ce779e829609c9e1075c81f2318f6ff4 (diff) | |
download | nixlib-89815eb9a00150c34edcc5872bbc93b9122decdc.tar nixlib-89815eb9a00150c34edcc5872bbc93b9122decdc.tar.gz nixlib-89815eb9a00150c34edcc5872bbc93b9122decdc.tar.bz2 nixlib-89815eb9a00150c34edcc5872bbc93b9122decdc.tar.lz nixlib-89815eb9a00150c34edcc5872bbc93b9122decdc.tar.xz nixlib-89815eb9a00150c34edcc5872bbc93b9122decdc.tar.zst nixlib-89815eb9a00150c34edcc5872bbc93b9122decdc.zip |
* gcc-wrapper: Propagate the wrapped gcc, binutils and glibc to the
user environment. (NIXPKGS-63) svn path=/nixpkgs/branches/stdenv-updates/; revision=10664
Diffstat (limited to 'pkgs/stdenv/generic')
-rw-r--r-- | pkgs/stdenv/generic/builder.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 2a74f038dca0..f772b1cc19b3 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -11,14 +11,14 @@ mkdir $out # Can't use substitute() here, because replace may not have been # built yet (in the bootstrap). sed \ - -e "s^@preHook@^$preHook^" \ - -e "s^@postHook@^$postHook^" \ - -e "s^@initialPath@^$initialPath^" \ - -e "s^@gcc@^$gcc^" \ - -e "s^@shell@^$shell^" \ - -e "s^@param1@^$p1^" \ - -e "s^@param2@^$p2^" \ - -e "s^@param3@^$p3^" \ - -e "s^@param4@^$p4^" \ - -e "s^@param5@^$p5^" \ + -e "s^@preHook@^$preHook^g" \ + -e "s^@postHook@^$postHook^g" \ + -e "s^@initialPath@^$initialPath^g" \ + -e "s^@gcc@^$gcc^g" \ + -e "s^@shell@^$shell^g" \ + -e "s^@param1@^$p1^g" \ + -e "s^@param2@^$p2^g" \ + -e "s^@param3@^$p3^g" \ + -e "s^@param4@^$p4^g" \ + -e "s^@param5@^$p5^g" \ < "$setup" > "$out/setup" |