* substitute() in stdenv: use the replace program instead of awful

  sed hackery.
* Some indentation fixes in setup.sh.

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

1 files changed, 11 insertions, 8 deletions

diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh
index f9dbc0e784f..c263b3f330e 100644
--- a/pkgs/build-support/gcc-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-wrapper/builder.sh
@@ -50,14 +50,17 @@ fi
 doSubstitute() {
     local src=$1
     local dst=$2
-    substitute "$src" "$dst" \
-        --subst-var "out" \
-        --subst-var "shell" \
-        --subst-var "gcc" \
-        --subst-var "gccProg" \
-        --subst-var "binutils" \
-        --subst-var "libc" \
-        --subst-var-by "ld" "$ldPath/ld"
+    # 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^" \
+        < "$src" > "$dst" 
 }