diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-29 17:34:00 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-29 17:34:00 +0000 |
| commit | 8ed9ea8b514afd07e1d2b20250817036c534178e (patch) | |
| tree | c906361d82f215124fd11f42d6527b6fb3c4e944 /pkgs | |
| parent | 12ae5363ea658d399bdb008f6ded3cde355f9310 (diff) | |
* Use a Nix shell for gcc-wrapper and ld-wrapper.
svn path=/nixpkgs/trunk/; revision=875
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/gcc-wrapper.sh | 2 | ||||
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/ld-wrapper.sh | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/initial/builder.sh | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh index ae8e647369401..f6f388911531a 100644 --- a/pkgs/build-support/gcc-wrapper/builder.sh +++ b/pkgs/build-support/gcc-wrapper/builder.sh @@ -39,6 +39,7 @@ mkGccWrapper () { sed \ -e "s^@gcc@^$src^g" \ -e "s^@out@^$out^g" \ + -e "s^@bash@^$SHELL^g" \ < $gccWrapper > $dst chmod +x $dst } @@ -57,6 +58,7 @@ sed \ -e "s^@out@^$out^g" \ -e "s^@ldflags@^$ldflags^g" \ -e "s^@ld@^$ldPath/ld^g" \ + -e "s^@bash@^$SHELL^g" \ < $ldWrapper > $out/bin/ld chmod +x $out/bin/ld diff --git a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh index d144e142d2145..21e519242091f 100644 --- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#! @bash@ -e if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then . "$NIX_GCC_WRAPPER_START_HOOK" diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh index 45bb210aa6d9f..1443af3315509 100644 --- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#! @bash@ -e if test -n "$NIX_LD_WRAPPER_START_HOOK"; then . "$NIX_LD_WRAPPER_START_HOOK" diff --git a/pkgs/stdenv/initial/builder.sh b/pkgs/stdenv/initial/builder.sh index 9aa5aa6ae18da..6673f7fea156a 100644 --- a/pkgs/stdenv/initial/builder.sh +++ b/pkgs/stdenv/initial/builder.sh @@ -3,5 +3,6 @@ export PATH=/usr/bin:/bin mkdir $out cat > $out/setup <<EOF export PATH=/usr/bin:/bin +export SHELL=/bin/sh EOF chmod +x $out/setup |