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/build-support/cc-wrapper | |
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/build-support/cc-wrapper')
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 9822b1a026a1..bea7e07a2029 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -145,7 +145,7 @@ stdenv.mkDerivation { + optionalString (stdenv.isSunOS && nativePrefix != "") '' # Solaris needs an additional ld wrapper. ldPath="${nativePrefix}/bin" - ld="$out/bin/ld-solaris" + exec="$ldPath/ld" wrap ld-solaris ${./ld-solaris-wrapper.sh} '') diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh index 9216ea3198dd..5a7b92b5ad7d 100644 --- a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh @@ -6,7 +6,7 @@ set -u # I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( # Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 # but still no success. -cmd="@prog@ -z ignore" +cmd="@ld@ -z ignore" args=("$@"); |