Skip to content

Commit

Permalink
Merge pull request #93687 from nh2/ghc-no-gold-20.03
Browse files Browse the repository at this point in the history
[20.03] ghc: do not use ld.gold with musl libc
  • Loading branch information
domenkozar authored Jul 23, 2020
2 parents 1975b86 + aea667b commit 93a38cd
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 7 deletions.
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.10.1.nix
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.4.4.nix
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.6.5.nix
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.8.1.nix
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.8.2.nix
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.8.3.nix
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/head.nix
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down

0 comments on commit 93a38cd

Please sign in to comment.