Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1975b8687474
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 93a38cd0982d
Choose a head ref
  • 3 commits
  • 7 files changed
  • 2 contributors

Commits on Jul 23, 2020

  1. 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

(cherry picked from commit 4675649)
    @adamse @nh2
    adamse authored and nh2 committed Jul 23, 2020
    Copy the full SHA
    e8e92a8 View commit details

  2. ghc: mention why ld.gold is disabled for musl libc 

    (cherry picked from commit 08a9d51)
    @adamse @nh2
    adamse authored and nh2 committed Jul 23, 2020
    Copy the full SHA
    aea667b View commit details

  3. Merge pull request #93687 from nh2/ghc-no-gold-20.03 

    [20.03] ghc: do not use ld.gold with musl libc
    @domenkozar
    domenkozar authored Jul 23, 2020
    Copy the full SHA
    93a38cd View commit details
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.10.1.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.4.4.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.6.5.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.8.1.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.8.2.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.8.3.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/head.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {