[commit: ghc] master: Set integer-gmp flag when appropriate (#684) (97f9345)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/97f93453e46eb52c64d661ba73c0bb03bfa81585/ghc

>---------------------------------------------------------------

commit 97f93453e46eb52c64d661ba73c0bb03bfa81585
Author: Alp Mestanogullari <alpmestan at gmail.com>
Date:   Wed Sep 12 19:18:18 2018 +0200

    Set integer-gmp flag when appropriate (#684)
    
    * set integer-gmp flag when appropriate, when building the compiler lib
    
    * address Andrey's feedback


>---------------------------------------------------------------

97f93453e46eb52c64d661ba73c0bb03bfa81585
 src/Settings/Packages.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Settings/Packages.hs b/src/Settings/Packages.hs
index 97e272b..ab9e8df 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) ]