cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge branch 'ghcjs-cross-without-cc-common' into ghcjs-cross-without-cc

Browse source
This commit is contained in:
John Ericson 2019-12-25 14:36:13 -05:00
commit 9cbbe2b00f
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/haskell-modules/generic-builder.nix
View file

@ -133,8 +133,11 @@ let
crossCabalFlags = [ crossCabalFlags = [
"--with-ghc=${ghcCommand}" "--with-ghc=${ghcCommand}"
"--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg" "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"
# Pass the "wrong" C compiler rather than none at all so packages that just
# use the C preproccessor still work, see
# https://github.com/haskell/cabal/issues/6466 for details.
"--with-gcc=${(if stdenv.hasCC then stdenv else buildPackages.stdenv).cc.targetPrefix}cc"
] ++ optionals stdenv.hasCC [ ] ++ optionals stdenv.hasCC [
"--with-gcc=${stdenv.cc.targetPrefix}cc"
"--with-ld=${stdenv.cc.bintools.targetPrefix}ld" "--with-ld=${stdenv.cc.bintools.targetPrefix}ld"
"--with-ar=${stdenv.cc.bintools.targetPrefix}ar" "--with-ar=${stdenv.cc.bintools.targetPrefix}ar"
# use the one that comes with the cross compiler. # use the one that comes with the cross compiler.