summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlp Mestanogullari <alpmestan@gmail.com>2018-09-12 19:18:18 +0200
committerAndrey Mokhov <andrey.mokhov@gmail.com>2018-09-12 19:18:18 +0200
commit97f93453e46eb52c64d661ba73c0bb03bfa81585 (patch)
tree5eee077f122a5cc5489e44e3909308a55dd07e42
parent9bf046f153911f3e5aedf081a394af9ae33bf1c6 (diff)
downloadhaskell-97f93453e46eb52c64d661ba73c0bb03bfa81585.tar.gz
Set integer-gmp flag when appropriate (#684)
* set integer-gmp flag when appropriate, when building the compiler lib * address Andrey's feedback
-rw-r--r--src/Settings/Packages.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Settings/Packages.hs b/src/Settings/Packages.hs
index 97e272b522..ab9e8df6db 100644
--- a/src/Settings/Packages.hs
+++ b/src/Settings/Packages.hs
@@ -22,7 +22,7 @@ packageArgs = do
mconcat
--------------------------------- base ---------------------------------
[ package base ? mconcat
- [ builder (Cabal Flags) ? arg ('+' : pkgName intLib)
+ [ builder (Cabal Flags) ? notStage0 ? arg (pkgName intLib)
-- This fixes the 'unknown symbol stat' issue.
-- See: https://github.com/snowleopard/hadrian/issues/259.
@@ -71,7 +71,8 @@ packageArgs = do
[ ghcWithNativeCodeGen ? arg "ncg"
, ghcWithInterpreter ? notStage0 ? arg "ghci"
, flag CrossCompiling ? arg "-terminfo"
- , stage2 ? arg "integer-simple" ]
+ , notStage0 ? intLib == integerGmp ?
+ arg "integer-gmp" ]
, builder (Haddock BuildPackage) ? arg ("--optghc=-I" ++ path) ]