Skip to content

Commit

Permalink
Merge pull request #84741 from adamse/haskell-updates
Browse files Browse the repository at this point in the history
ghc: do not use ld.gold with musl libc #84670
  • Loading branch information
cdepillabout authored Apr 9, 2020
2 parents 7029177 + acfccf7 commit fcd35ef
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 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,7 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
2 changes: 1 addition & 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,7 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
2 changes: 1 addition & 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,7 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
2 changes: 1 addition & 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,7 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
2 changes: 1 addition & 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,7 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
2 changes: 1 addition & 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,7 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

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

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down

0 comments on commit fcd35ef

Please sign in to comment.