* 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
This commit is contained in:
Eelco Dolstra 2003-08-20 11:13:13 +00:00
parent ea7ab23109
commit eaadea1e2a
4 changed files with 5 additions and 6 deletions

View file

@ -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()

View file

@ -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@

View file

@ -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++

View file

@ -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++