Skip to content

Commit

Permalink
ghc*-binary: Remove no-op --with-gmp-libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
nh2 committed Jul 10, 2021
1 parent 0044356 commit 63b1e6e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
6 changes: 2 additions & 4 deletions pkgs/development/compilers/ghc/8.10.2-binary.nix
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,9 @@ stdenv.mkDerivation rec {

configurePlatforms = [ ];
configureFlags = [
# Note that musl-based bindists seem to do nothing with the
# `--with-gmp-libraries` flag, see:
# https://gitlab.haskell.org/ghc/ghc/-/issues/20073#note_363231
"--with-gmp-libraries=${lib.getLib gmp}/lib"
"--with-gmp-includes=${lib.getDev gmp}/include"
# Note `--with-gmp-libraries` does nothing for GHC bindists:
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124
] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
# From: https://github.com/NixOS/nixpkgs/pull/43369/commits
++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/ghc/8.6.5-binary.nix
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,9 @@ stdenv.mkDerivation rec {

configurePlatforms = [ ];
configureFlags = [
"--with-gmp-libraries=${lib.getLib gmp}/lib"
"--with-gmp-includes=${lib.getDev gmp}/include"
# Note `--with-gmp-libraries` does nothing for GHC bindists:
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124
] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";

Expand Down

0 comments on commit 63b1e6e

Please sign in to comment.