* gcc-wrapper: Propagate the wrapped gcc, binutils and glibc to the

  user environment.  (NIXPKGS-63)

svn path=/nixpkgs/branches/stdenv-updates/; revision=10664

1 files changed, 15 insertions, 7 deletions

diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh
index c263b3f330ed..7a2f9c20f27f 100644
--- a/pkgs/build-support/gcc-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-wrapper/builder.sh
@@ -53,13 +53,13 @@ doSubstitute() {
     # Can't use substitute() here, because replace may not have been
     # built yet (in the bootstrap).
     sed \
-        -e "s^@out@^$out^" \
-        -e "s^@shell@^$shell^" \
-        -e "s^@gcc@^$gcc^" \
-        -e "s^@gccProg@^$gccProg^" \
-        -e "s^@binutils@^$binutils^" \
-        -e "s^@libc@^$libc^" \
-        -e "s^@ld@^$ldPath/ld^" \
+        -e "s^@out@^$out^g" \
+        -e "s^@shell@^$shell^g" \
+        -e "s^@gcc@^$gcc^g" \
+        -e "s^@gccProg@^$gccProg^g" \
+        -e "s^@binutils@^$binutils^g" \
+        -e "s^@libc@^$libc^g" \
+        -e "s^@ld@^$ldPath/ld^g" \
         < "$src" > "$dst" 
 }
 
@@ -111,3 +111,11 @@ doSubstitute "$addFlags" "$out/nix-support/add-flags.sh"
 doSubstitute "$setupHook" "$out/nix-support/setup-hook"
 
 cp -p $utils $out/nix-support/utils.sh
+
+
+# Propagate the wrapped gcc so that if you install the wrapper, you get
+# tools like gcov, the manpages, etc. as well (including for binutils
+# and Glibc).
+if test -z "$nativeTools"; then
+    echo $gcc $binutils $libc > $out/nix-support/propagated-user-env-packages
+fi