From 4675649d9cd06d13f8f127855dda4993881dd81b Mon Sep 17 00:00:00 2001 From: Adam Sandberg Ericsson Date: Wed, 8 Apr 2020 19:03:44 +0100 Subject: [PATCH] ghc: don't use ld.gold with musl libc (fixes #84670) ld.gold doesn't play well with musl as is documented in #49071 and https://sourceware.org/bugzilla/show_bug.cgi?id=23856 --- pkgs/development/compilers/ghc/8.10.1.nix | 2 +- pkgs/development/compilers/ghc/8.4.4.nix | 2 +- pkgs/development/compilers/ghc/8.6.5.nix | 2 +- pkgs/development/compilers/ghc/8.8.1.nix | 2 +- pkgs/development/compilers/ghc/8.8.2.nix | 2 +- pkgs/development/compilers/ghc/8.8.3.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index d449fef8020923..0a1777f937ddcf 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -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 { diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 7f8e09aa782443..befe8f2e632a1a 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -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 { diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index ccc10628b53545..c02be9086038f3 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -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 { diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index 58b1cf46880643..9156efe16f6fa3 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -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 { diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index d80ba0d1b901d1..ae8f56df95e658 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -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 { diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index e98b805c533737..37c3fcf213555a 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -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 { diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 541854e8796e41..52845a05ce19f9 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -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 {