diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-05 09:14:08 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-05 09:14:08 +0100 |
| commit | 51ef7c3e497ec09d4bc6b67c7e47e61c308454aa (patch) | |
| tree | b0fd889cc90b9fdc732df4f9c1c4a85419104b4f /pkgs/development/compilers/ghc/8.4.4.nix | |
| parent | 30fae2883e655c170e76d0827bcd9f396e9658af (diff) | |
| parent | 1451a52a38f2dda459647a5c2628e7c28e17c4dc (diff) | |
| download | nixlib-51ef7c3e497ec09d4bc6b67c7e47e61c308454aa.tar nixlib-51ef7c3e497ec09d4bc6b67c7e47e61c308454aa.tar.gz nixlib-51ef7c3e497ec09d4bc6b67c7e47e61c308454aa.tar.bz2 nixlib-51ef7c3e497ec09d4bc6b67c7e47e61c308454aa.tar.lz nixlib-51ef7c3e497ec09d4bc6b67c7e47e61c308454aa.tar.xz nixlib-51ef7c3e497ec09d4bc6b67c7e47e61c308454aa.tar.zst nixlib-51ef7c3e497ec09d4bc6b67c7e47e61c308454aa.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/ghc/8.4.4.nix')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.4.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 52fb926cdc68..73c7e4708d5c 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" |