public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r16645, which was intended for the `stdenv-updates' branch.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16646
This commit is contained in:
Ludovic Courtès 2009-08-10 13:37:18 +00:00
parent 09ab84a431
commit a58d165524
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/build-support/gcc-wrapper/builder.sh
View File

@ -83,7 +83,7 @@ mkGccWrapper() {
if ! test -f "$src"; then if ! test -f "$src"; then
echo "$src does not exist (skipping)" echo "$src does not exist (skipping)"
return 1 return
fi fi
gccProg="$src" gccProg="$src"
@ -91,24 +91,18 @@ mkGccWrapper() {
chmod +x "$dst" chmod +x "$dst"
} }
if mkGccWrapper $out/bin/gcc $gccPath/gcc mkGccWrapper $out/bin/gcc $gccPath/gcc
then ln -s gcc $out/bin/cc
ln -sv gcc $out/bin/cc
fi
if mkGccWrapper $out/bin/g++ $gccPath/g++ mkGccWrapper $out/bin/g++ $gccPath/g++
then ln -s g++ $out/bin/c++
ln -sv g++ $out/bin/c++
fi
if mkGccWrapper $out/bin/gfortran $gccPath/gfortran if test -e $gccPath/gfortran; then
then mkGccWrapper $out/bin/gfortran $gccPath/gfortran
ln -sv gfortran $out/bin/g77 ln -s gfortran $out/bin/g77
ln -sv gfortran $out/bin/f77 ln -s gfortran $out/bin/f77
fi fi
mkGccWrapper $out/bin/gcj $gccPath/gcj
# Create a symlink to as (the assembler). This is useful when a # Create a symlink to as (the assembler). This is useful when a
# gcc-wrapper is installed in a user environment, as it ensures that # gcc-wrapper is installed in a user environment, as it ensures that