hadrian: Pass integer_backend to testsuite driver

[ghc.git] / ghc / ghc-bin.cabal.in

diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 6c12941..7819330 100644 (file)
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -24,6 +24,11 @@ Flag ghci
     Default: False
     Manual: True
 
     Default: False
     Manual: True
 

+Flag threaded
+    Description: Link the ghc executable against the threaded RTS
+    Default: True
+    Manual: True
+

 Executable ghc
     Default-Language: Haskell2010
 
 Executable ghc
     Default-Language: Haskell2010
 


@@ -52,11 +57,12 @@ Executable ghc
     if flag(ghci)
         -- NB: this is never built by the bootstrapping GHC+libraries
         Build-depends:
     if flag(ghci)
         -- NB: this is never built by the bootstrapping GHC+libraries
         Build-depends:

-            containers     == 0.5.*,
+            containers     >= 0.5 && < 0.7,

             deepseq        == 1.4.*,
             deepseq        == 1.4.*,

+            ghc-prim       == 0.5.*,

             ghci           == @ProjectVersionMunged@,
             haskeline      == 0.7.*,
             ghci           == @ProjectVersionMunged@,
             haskeline      == 0.7.*,

-            time           == 1.8.*,
+            time           >= 1.8 && < 1.10,

             transformers   == 0.5.*
         CPP-Options: -DGHCI
         GHC-Options: -fno-warn-name-shadowing
             transformers   == 0.5.*
         CPP-Options: -DGHCI
         GHC-Options: -fno-warn-name-shadowing


@@ -79,7 +85,19 @@ Executable ghc
             UnboxedTuples
             ViewPatterns
 
             UnboxedTuples
             ViewPatterns
 

+    -- The flag being True by default, this reflects the
+    -- mk/config.mk.in logic for GhcThreaded (which ends up
+    -- always being True as well). One can still opt out by
+    -- disabling this flag.
+    if flag(threaded)
+      ghc-options: -threaded
+

     Other-Extensions:
         CPP
         NondecreasingIndentation
         TupleSections
     Other-Extensions:
         CPP
         NondecreasingIndentation
         TupleSections

+
+    -- This should match the default-extensions used in 'ghc.cabal'. This way,
+    -- GHCi can be used to load it all at once.
+    Default-Extensions:
+        NoImplicitPrelude