diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2003-08-20 11:13:13 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2003-08-20 11:13:13 +0000 |
| commit | eaadea1e2a8f54ff8707490613ac50d32af8d761 (patch) | |
| tree | 7496f2c2ca4a78d1ccd49d4392c2fb814ce626af /pkgs | |
| parent | ea7ab231095f3fa0e1d03e738ccb9deb45b94943 (diff) | |
* Initialise the PATH immediately at the start of stdenv-linux, otherwise
baseenv won't work properly (because it can't find programs such as `cat'). svn path=/nixpkgs/trunk/; revision=331
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/baseenv/setup.sh | 2 | ||||
| -rw-r--r-- | pkgs/stdenv-linux/setup.sh | 6 | ||||
| -rwxr-xr-x | pkgs/stdenv-linux/stdenv-build.sh | 1 | ||||
| -rwxr-xr-x | pkgs/stdenv-linux/stdenv-nativetools-build.sh | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/baseenv/setup.sh b/pkgs/baseenv/setup.sh index 3b8263a8df3e2..4cdd3518247b5 100644 --- a/pkgs/baseenv/setup.sh +++ b/pkgs/baseenv/setup.sh @@ -1,5 +1,5 @@ # Add the directory containing the GCC wrappers to the PATH. -export PATH=@OUT@/bin +export PATH=@OUT@/bin:$PATH # Recursively add all envpkgs to the relevant environment variables. addtoenv() diff --git a/pkgs/stdenv-linux/setup.sh b/pkgs/stdenv-linux/setup.sh index 3d37b2750c9c7..396abf41c54bf 100644 --- a/pkgs/stdenv-linux/setup.sh +++ b/pkgs/stdenv-linux/setup.sh @@ -1,9 +1,9 @@ +export PATH=@PATH@ +export SHELL=@SHELL@ + . @BASEENV@/setup export NIX_CFLAGS="-isystem @GLIBC@/include $NIX_CFLAGS" export NIX_LDFLAGS="-L @GLIBC@/lib -Wl,-dynamic-linker,@GLIBC@/lib/ld-linux.so.2,-rpath,@GLIBC@/lib $NIX_LDFLAGS" export NIX_CC=@CC@ export NIX_CXX=@CXX@ - -export PATH=@PATH@ -export SHELL=@SHELL@ diff --git a/pkgs/stdenv-linux/stdenv-build.sh b/pkgs/stdenv-linux/stdenv-build.sh index 6695cb058a9b4..005a6f8043d35 100755 --- a/pkgs/stdenv-linux/stdenv-build.sh +++ b/pkgs/stdenv-linux/stdenv-build.sh @@ -14,7 +14,6 @@ for i in $tools; do fi p=$p$i/bin done -p=$p':$PATH' cc=$gcc/bin/gcc cxx=$gcc/bin/g++ diff --git a/pkgs/stdenv-linux/stdenv-nativetools-build.sh b/pkgs/stdenv-linux/stdenv-nativetools-build.sh index 8d2094c9204cd..3c0e61b2ba4bd 100755 --- a/pkgs/stdenv-linux/stdenv-nativetools-build.sh +++ b/pkgs/stdenv-linux/stdenv-nativetools-build.sh @@ -4,7 +4,7 @@ export PATH=/bin:/usr/bin mkdir $out || exit 1 -p='$PATH:/usr/local/bin:/usr/bin:/bin' +p='/usr/local/bin:/usr/bin:/bin' cc=/usr/bin/gcc cxx=/usr/bin/g++ |