diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-11 23:10:27 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-11 23:10:27 +0200 |
| commit | 2c65f3fa664cd7562104b677ef1fe94194ac2810 (patch) | |
| tree | 6f67fa02162332e1da60de12d10988c353ef4ceb | |
| parent | 34f6e629b59d104c7023f1bf41e679bb4e625609 (diff) | |
| download | nixlib-2c65f3fa664cd7562104b677ef1fe94194ac2810.tar nixlib-2c65f3fa664cd7562104b677ef1fe94194ac2810.tar.gz nixlib-2c65f3fa664cd7562104b677ef1fe94194ac2810.tar.bz2 nixlib-2c65f3fa664cd7562104b677ef1fe94194ac2810.tar.lz nixlib-2c65f3fa664cd7562104b677ef1fe94194ac2810.tar.xz nixlib-2c65f3fa664cd7562104b677ef1fe94194ac2810.tar.zst nixlib-2c65f3fa664cd7562104b677ef1fe94194ac2810.zip | |
Fix stdenv-native
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/default.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index e2f57cfe43c9..b2f7d07560d3 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -118,7 +118,6 @@ stdenv.mkDerivation { gccPath="$gcc/bin" ldPath="$binutils/bin" - ld="$ldPath/ld" # Propagate the wrapped gcc so that if you install the wrapper, # you get tools like gcov, the manpages, etc. as well (including @@ -143,7 +142,7 @@ stdenv.mkDerivation { ln -s $ldPath/as $out/bin/as fi - wrap ld ${./ld-wrapper.sh} $ld + wrap ld ${./ld-wrapper.sh} ''${ld:-$ldPath/ld} if [ -e $binutils/bin/ld.gold ]; then wrap ld.gold ${./ld-wrapper.sh} $binutils/bin/ld.gold @@ -156,19 +155,15 @@ stdenv.mkDerivation { if [ -e $gccPath/gcc ]; then wrap gcc ${./gcc-wrapper.sh} $gccPath/gcc 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 if [ -e $gccPath/g++ ]; then wrap g++ ${./gcc-wrapper.sh} $gccPath/g++ ln -s g++ $out/bin/c++ - fi - - if [ -e $gccPath/clang ]; then - wrap clang ${./gcc-wrapper.sh} $gccPath/clang - ln -s clang $out/bin/cc - fi - - if [ -e $gccPath/clang++ ]; then + elif [ -e $gccPath/clang++ ]; then wrap clang++ ${./gcc-wrapper.sh} $gccPath/clang++ ln -s clang++ $out/bin/c++ fi |