diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-09 14:00:27 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-09 14:00:27 +0200 |
| commit | 9bd78cb0488040ea996b27e82135396a45325af5 (patch) | |
| tree | fe8e48ceab8d69e7e51bd1f04ec6aae0ca7dafec /pkgs/development/compilers/ghc/8.6.5.nix | |
| parent | a12aeebedbac1bbb02d1beec35925c433cf022f5 (diff) | |
| parent | 246c223e877989c5763ce905bfa42b3f32fe2c18 (diff) | |
| download | nixlib-9bd78cb0488040ea996b27e82135396a45325af5.tar nixlib-9bd78cb0488040ea996b27e82135396a45325af5.tar.gz nixlib-9bd78cb0488040ea996b27e82135396a45325af5.tar.bz2 nixlib-9bd78cb0488040ea996b27e82135396a45325af5.tar.lz nixlib-9bd78cb0488040ea996b27e82135396a45325af5.tar.xz nixlib-9bd78cb0488040ea996b27e82135396a45325af5.tar.zst nixlib-9bd78cb0488040ea996b27e82135396a45325af5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/ghc/8.6.5.nix')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.5.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index 44ad6da2ff51..c859a34729d0 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -125,7 +125,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.isAarch32 ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".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" |