diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-13 14:23:09 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-13 14:23:09 +0000 |
| commit | 5f45fb3ae986119b4360613901a1c033a2ee327e (patch) | |
| tree | 08448fced019fe7676f255cd13c2ea228425876d /pkgs/stdenv/generic/builder.sh | |
| parent | 3db3e079afaaae281124ee9ff1b34df3fa197824 (diff) | |
| download | nixlib-5f45fb3ae986119b4360613901a1c033a2ee327e.tar nixlib-5f45fb3ae986119b4360613901a1c033a2ee327e.tar.gz nixlib-5f45fb3ae986119b4360613901a1c033a2ee327e.tar.bz2 nixlib-5f45fb3ae986119b4360613901a1c033a2ee327e.tar.lz nixlib-5f45fb3ae986119b4360613901a1c033a2ee327e.tar.xz nixlib-5f45fb3ae986119b4360613901a1c033a2ee327e.tar.zst nixlib-5f45fb3ae986119b4360613901a1c033a2ee327e.zip | |
* 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
Diffstat (limited to 'pkgs/stdenv/generic/builder.sh')
| -rw-r--r-- | pkgs/stdenv/generic/builder.sh | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index ee2dbb3d0f9e..2a74f038dca0 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -8,14 +8,17 @@ source $stdenv/setup mkdir $out -substitute "$setup" "$out/setup" \ - --subst-var preHook \ - --subst-var postHook \ - --subst-var initialPath \ - --subst-var gcc \ - --subst-var shell \ - --subst-var-by param1 "$p1" \ - --subst-var-by param2 "$p2" \ - --subst-var-by param3 "$p3" \ - --subst-var-by param4 "$p4" \ - --subst-var-by param5 "$p5" +# 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^" \ + < "$setup" > "$out/setup" |