diff options
author | Danny Wilson <danny@prime.vc> | 2015-11-08 02:44:38 +0100 |
---|---|---|
committer | Danny Wilson <danny@prime.vc> | 2015-11-16 17:20:16 +0100 |
commit | f17dea3b3dcae065c6ddb187111bef2975ad2eba (patch) | |
tree | d016c96ab40c9761959e4c70a9baac97c855e62f /pkgs/development | |
parent | bab0a82983d9b230ababcb6501f1b58a8541fbbf (diff) | |
download | nixlib-f17dea3b3dcae065c6ddb187111bef2975ad2eba.tar nixlib-f17dea3b3dcae065c6ddb187111bef2975ad2eba.tar.gz nixlib-f17dea3b3dcae065c6ddb187111bef2975ad2eba.tar.bz2 nixlib-f17dea3b3dcae065c6ddb187111bef2975ad2eba.tar.lz nixlib-f17dea3b3dcae065c6ddb187111bef2975ad2eba.tar.xz nixlib-f17dea3b3dcae065c6ddb187111bef2975ad2eba.tar.zst nixlib-f17dea3b3dcae065c6ddb187111bef2975ad2eba.zip |
Fix compilation of GCC 4.9 on SmartOS.
Fix ld-solaris-wrapper never calling ld (since gcc->cc-wrapper refactor).
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/gcc/4.9/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 13154ddd27a6..fecdd85cd415 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -293,9 +293,8 @@ stdenv.mkDerivation ({ ++ (optional stdenv.isDarwin gnused) ; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl"; - preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) '' + sed -i -e "s/-lrt//g" libstdc++-v3/configure export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" @@ -518,6 +517,7 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd ++ + stdenv.lib.platforms.illumos ++ optionals (langAda == false) stdenv.lib.platforms.darwin; }; } |