Merge #66310: ghc: use ld.gold only on Linux
commit83fdb5f74858fd77913de2f2459e3727a026ad5e
authorVladimír Čunát <v@cunat.cz>
dateThu 8 Aug 2019, 11:21 (7 years ago)
parentee68421639c8c1
pkgs/development/compilers/ghc/8.2.2.nix+1−1
@@ -166,7 +166,7 @@ stdenv.mkDerivation (rec {
166166 export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
167167 export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
168168 # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
169− export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
169+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
170170 export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
171171 export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
172172 export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
pkgs/development/compilers/ghc/8.4.4.nix+1−1
@@ -126,7 +126,7 @@ stdenv.mkDerivation (rec {
126126 export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
127127 export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
128128 # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
129− export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
129+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
130130 export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
131131 export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
132132 export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
pkgs/development/compilers/ghc/8.6.4.nix+1−1
@@ -125,7 +125,7 @@ stdenv.mkDerivation (rec {
125125 export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
126126 export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
127127 # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
128− export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
128+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
129129 export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
130130 export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
131131 export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
pkgs/development/compilers/ghc/8.6.5.nix+1−1
@@ -125,7 +125,7 @@ stdenv.mkDerivation (rec {
125125 export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
126126 export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
127127 # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
128− export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
128+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
129129 export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
130130 export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
131131 export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
pkgs/development/compilers/ghc/8.8.1.nix+1−1
@@ -110,7 +110,7 @@ stdenv.mkDerivation (rec {
110110 export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
111111 export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
112112 # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
113− export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
113+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
114114 export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
115115 export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
116116 export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
pkgs/development/compilers/ghc/head.nix+1−1
@@ -120,7 +120,7 @@ stdenv.mkDerivation (rec {
120120 export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
121121 # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
122122 # and more generally have a faster linker.
123− export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
123+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
124124 export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
125125 export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
126126 export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"