alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fix stdenv-native

Browse source
This commit is contained in:
Eelco Dolstra 2014-10-11 23:10:27 +02:00
parent 34f6e629b5
commit 2c65f3fa66
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/build-support/gcc-wrapper/default.nix
View file

@ -118,7 +118,6 @@ stdenv.mkDerivation {
gccPath="$gcc/bin" gccPath="$gcc/bin"
ldPath="$binutils/bin" ldPath="$binutils/bin"
ld="$ldPath/ld"
# Propagate the wrapped gcc so that if you install the wrapper, # Propagate the wrapped gcc so that if you install the wrapper,
# you get tools like gcov, the manpages, etc. as well (including # you get tools like gcov, the manpages, etc. as well (including
@ -143,7 +142,7 @@ stdenv.mkDerivation {
ln -s $ldPath/as $out/bin/as ln -s $ldPath/as $out/bin/as
fi fi
wrap ld ${./ld-wrapper.sh} $ld wrap ld ${./ld-wrapper.sh} ''${ld:-$ldPath/ld}
if [ -e $binutils/bin/ld.gold ]; then if [ -e $binutils/bin/ld.gold ]; then
wrap ld.gold ${./ld-wrapper.sh} $binutils/bin/ld.gold wrap ld.gold ${./ld-wrapper.sh} $binutils/bin/ld.gold
@ -156,19 +155,15 @@ stdenv.mkDerivation {
if [ -e $gccPath/gcc ]; then if [ -e $gccPath/gcc ]; then
wrap gcc ${./gcc-wrapper.sh} $gccPath/gcc wrap gcc ${./gcc-wrapper.sh} $gccPath/gcc
ln -s gcc $out/bin/cc ln -s gcc $out/bin/cc
elif [ -e $gccPath/clang ]; then
wrap clang ${./gcc-wrapper.sh} $gccPath/clang
ln -s clang $out/bin/cc
fi fi
if [ -e $gccPath/g++ ]; then if [ -e $gccPath/g++ ]; then
wrap g++ ${./gcc-wrapper.sh} $gccPath/g++ wrap g++ ${./gcc-wrapper.sh} $gccPath/g++
ln -s g++ $out/bin/c++ ln -s g++ $out/bin/c++
fi elif [ -e $gccPath/clang++ ]; then
if [ -e $gccPath/clang ]; then
wrap clang ${./gcc-wrapper.sh} $gccPath/clang
ln -s clang $out/bin/cc
fi
if [ -e $gccPath/clang++ ]; then
wrap clang++ ${./gcc-wrapper.sh} $gccPath/clang++ wrap clang++ ${./gcc-wrapper.sh} $gccPath/clang++
ln -s clang++ $out/bin/c++ ln -s clang++ $out/bin/c++
fi fi