* Re-enabled purity checking: it should work now. First we only
checked whether absolute paths passed to gcc/ld refer to the store, which is wrong: they can also refer to the build tree (/tmp/nix-...). * Less static composition in the construction of stdenv-nix-linux: gcc-wrapper and generic are now passed in as arguments, rather then referenced by relative path. This makes it easier to hack on a specific stage of the bootstrap process (before, a change to, e.g., generic/setup.sh would cause all bootstrap stages to be redone). svn path=/nixpkgs/trunk/; revision=833
This commit is contained in:
@@ -6,10 +6,7 @@ export NIX_DEBUG=1
|
||||
|
||||
. $stdenv/setup
|
||||
|
||||
#echo starting shell
|
||||
#/bin/sh < /dev/tty > /dev/tty 2>&1
|
||||
|
||||
#exit 1
|
||||
export NIX_ENFORCE_PURITY=1
|
||||
|
||||
mkdir $out
|
||||
mkdir $out/bin
|
||||
@@ -25,7 +22,7 @@ int main(int argc, char * * argv)
|
||||
EOF
|
||||
|
||||
#gcc -I/nix/store/foo -I /nix/store/foo -I/usr/lib -I /usr/lib hello.c -o $out/bin/hello
|
||||
gcc -L /nix/store/abcd/lib -isystem /usr/lib hello.c -o $out/bin/hello
|
||||
gcc -I`pwd` -L /nix/store/abcd/lib -isystem /usr/lib hello.c -o $out/bin/hello
|
||||
|
||||
$out/bin/hello
|
||||
|
||||
|
||||
Reference in New Issue
Block a user