X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghc.cabal;h=b1de64ef69a02b1685227e1b0dd6f4b11e5e9d74;hb=bef67119f9d329f4d41abef55a67db6b9baad83b;hp=2bb88fd3e97c9ef31e4474686614492e7b2ac519;hpb=71cd62b8fff15a9beea524bcd2953a525e9d33f8;p=ghc-hetmet.git

diff --git a/compiler/ghc.cabal b/compiler/ghc.cabal
index 2bb88fd..b1de64e 100644
--- a/compiler/ghc.cabal
+++ b/compiler/ghc.cabal
@@ -14,6 +14,9 @@ Category: XXX
 Build-Type: Simple
 Cabal-Version: >= 1.2
 
+Flag base4
+    Description: Choose the even newer, even smaller, split-up base package.
+
 Flag base3
     Description: Choose the new smaller, split-up base package.
 
@@ -26,26 +29,37 @@ Flag editline
 Flag ghci
     Description: Build GHCi support.
 
+Flag ncg
+    Description: Build the NCG.
+
 Flag stage1
     Description: Is this stage 1?
 
-Flag windows
-    Description: On a Windows machine
-
 Library
+    Exposed: False
+
+    if flag(base4)
+        Build-Depends: base       >= 4   && < 5
     if flag(base3)
-        Build-Depends: base       >= 3   && < 4,
-                       directory  >= 1   && < 1.1,
+        Build-Depends: base       >= 3   && < 4
+    if !flag(base3) && !flag(base4)
+        Build-Depends: base       < 3
+
+    if flag(base4)
+        Build-Depends: concurrent >= 0.1 && < 0.2,
+                       st         >= 0.1 && < 0.2
+
+    if flag(base3) || flag(base4)
+        Build-Depends: directory  >= 1   && < 1.1,
                        process    >= 1   && < 1.1,
                        bytestring >= 0.9 && < 0.10,
                        old-time   >= 1   && < 1.1,
                        containers >= 0.1 && < 0.2,
                        array      >= 0.1 && < 0.2
-    else
-        Build-Depends: base < 3
+
     Build-Depends: filepath >= 1 && < 1.2
     Build-Depends: haskell98, Cabal, hpc
-    if flag(windows)
+    if os(windows)
         Build-Depends: Win32
     else
         Build-Depends: unix
@@ -61,6 +75,9 @@ Library
         CPP-Options: -DGHCI
         Include-Dirs: ../libffi/build/include
 
+    if !flag(ncg)
+        CPP-Options: -DOMIT_NATIVE_CODEGEN
+
     -- GHC 6.4.2 needs to be able to find WCsubst.c, which needs to be
     -- able to find WCsubst.h
     Include-Dirs: ../libraries/base/cbits, ../libraries/base/include
@@ -72,12 +89,10 @@ Library
 
     Include-Dirs: . parser utils
 
-    -- XXX Change these directory names: The stage2 files are what
-    --     we want for all stages >= 1
     if flag(stage1)
         Include-Dirs: stage1
     else
-        Include-Dirs: stage2
+        Include-Dirs: stage2plus
     Install-Includes: HsVersions.h, ghc_boot_platform.h
 
     c-sources:
@@ -101,7 +116,6 @@ Library
         hsSyn
         iface
         main
-        nativeGen
         parser
         prelude
         profiling
@@ -120,6 +134,7 @@ Library
         BasicTypes
         DataCon
         Demand
+        Exception
         Id
         IdInfo
         Literal
@@ -209,6 +224,7 @@ Library
         CoreUnfold
         CoreUtils
         ExternalCore
+        MkCore
         MkExternalCore
         PprCore
         PprExternalCore
@@ -270,24 +286,6 @@ Library
         StaticFlags
         SysTools
         TidyPgm
-        AsmCodeGen
-        MachCodeGen
-        MachInstrs
-        MachRegs
-        NCGMonad
-        PositionIndependentCode
-        PprMach
-        RegAllocColor
-        RegAllocInfo
-        RegAllocLinear
-        RegAllocStats
-        RegArchBase
-        RegArchX86
-        RegCoalesce
-        RegLiveness
-        RegSpill
-        RegSpillClean
-        RegSpillCost
         Ctype
         HaddockLex
         HaddockParse
@@ -419,6 +417,30 @@ Library
         VectUtils
         Vectorise
 
+    if flag(ncg)
+        hs-source-dirs:
+            nativeGen
+
+        Exposed-Modules:
+            AsmCodeGen
+            MachCodeGen
+            MachInstrs
+            MachRegs
+            NCGMonad
+            PositionIndependentCode
+            PprMach
+            RegAllocColor
+            RegAllocInfo
+            RegAllocLinear
+            RegAllocStats
+            RegArchBase
+            RegArchX86
+            RegCoalesce
+            RegLiveness
+            RegSpill
+            RegSpillClean
+            RegSpillCost
+
     if flag(ghci)
         Exposed-Modules:
             DsMeta