diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-12 11:12:18 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-12 11:12:18 +0000 |
| commit | 0fd59fd7a41a47478f241b4a27c39d39f42914b9 (patch) | |
| tree | 08c4488a5118b997c2721c8f793fd55028df2c73 /pkgs/build-support/gcc-wrapper/builder.sh | |
| parent | de13527000165c566e47d2146a1a6480fc67da59 (diff) | |
* 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
Diffstat (limited to 'pkgs/build-support/gcc-wrapper/builder.sh')
| -rwxr-xr-x | pkgs/build-support/gcc-wrapper/builder.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh index 352a5895135fd..5da6af4bdb60d 100755 --- a/pkgs/build-support/gcc-wrapper/builder.sh +++ b/pkgs/build-support/gcc-wrapper/builder.sh @@ -56,6 +56,7 @@ ln -s g77 $out/bin/f77 sed \ + -e "s^@out@^$out^g" \ -e "s^@ldflags@^$ldflags^g" \ -e "s^@ld@^$ldPath/ld^g" \ < $ldWrapper > $out/bin/ld @@ -63,7 +64,7 @@ chmod +x $out/bin/ld mkdir $out/nix-support -test -z "$gcc" && echo $gcc > $out/nix-support/orig-gcc +test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc test -n "$glibc" && echo $glibc > $out/nix-support/orig-glibc cat > $out/nix-support/add-flags <<EOF @@ -77,3 +78,5 @@ sed \ -e "s^@binutils@^$binutils^g" \ -e "s^@glibc@^$glibc^g" \ < $setupHook > $out/nix-support/setup-hook + +cp -p $utils $out/nix-support/utils \ No newline at end of file |