X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghc.cabal.in;h=c4be998be02637a1961f90d1c1f6f28dbbae0382;hp=741f4c73309f68c0267cfd12280d88242d23cdfa;hb=c5b178be60a5a44abd2f4ddf8c399857678326e2;hpb=0e82126ed0bd2d16a1925d8a8a6c5eb6d7762ac5

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 741f4c7..c4be998 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -36,22 +36,20 @@ Flag ghci
     Default: False
     Manual: True
 
-Flag ncg
-    Description: Build the NCG.
-    Default: False
-    Manual: True
-
 Flag stage1
     Description: Is this stage 1?
     Default: False
+    Manual: True
 
 Flag stage2
     Description: Is this stage 2?
     Default: False
+    Manual: True
 
 Flag stage3
     Description: Is this stage 3?
     Default: False
+    Manual: True
 
 Library
     Exposed: False
@@ -64,11 +62,11 @@ Library
         Build-Depends: base       < 3
 
     if flag(base3) || flag(base4)
-        Build-Depends: directory  >= 1   && < 1.1,
+        Build-Depends: directory  >= 1   && < 1.2,
                        process    >= 1   && < 1.1,
                        bytestring >= 0.9 && < 0.10,
                        old-time   >= 1   && < 1.1,
-                       containers >= 0.1 && < 0.4,
+                       containers >= 0.1 && < 0.5,
                        array      >= 0.1 && < 0.4
 
     Build-Depends: filepath >= 1 && < 1.3
@@ -85,10 +83,8 @@ Library
         CPP-Options: -DGHCI
         Include-Dirs: ../libffi/build/include
 
-    if !flag(ncg)
-        CPP-Options: -DOMIT_NATIVE_CODEGEN
-
     Build-Depends: bin-package-db
+    Build-Depends: hoopl
 
     -- GHC 6.4.2 needs to be able to find WCsubst.c, which needs to be
     -- able to find WCsubst.h
@@ -98,7 +94,9 @@ Library
                 ForeignFunctionInterface, EmptyDataDecls,
                 TypeSynonymInstances, MultiParamTypeClasses,
                 FlexibleInstances, Rank2Types, ScopedTypeVariables,
-                DeriveDataTypeable, RelaxedPolyRec
+                DeriveDataTypeable
+    if impl(ghc >= 7.1)
+        Extensions: NondecreasingIndentation
 
     Include-Dirs: . parser utils
 
@@ -152,6 +150,7 @@ Library
         DataCon
         Demand
         Exception
+        GhcMonad
         Id
         IdInfo
         Literal
@@ -182,45 +181,38 @@ Library
         BlockId
         CLabel
         Cmm
-        CmmBrokenBlock
         CmmBuildInfoTables
-        CmmCPS
-        CmmCPSGen
-        CmmCPSZ
+        CmmPipeline
         CmmCallConv
-        CmmCommonBlockElimZ
+        CmmCommonBlockElim
         CmmContFlowOpt
         CmmCvt
+        CmmDecl
         CmmExpr
         CmmInfo
         CmmLex
         CmmLint
         CmmLive
-        CmmLiveZ
+        CmmMachOp
+        CmmNode
         CmmOpt
         CmmParse
         CmmProcPoint
-        CmmProcPointZ
         CmmSpillReload
+        CmmRewriteAssignments
         CmmStackLayout
-        CmmTx
+        CmmType
         CmmUtils
-        CmmZipUtil
-        DFMonad
-        Dataflow
-        MkZipCfg
-        MkZipCfgCmm
+        MkGraph
+        OldCmm
+        OldCmmUtils
+        OldPprCmm
         OptimizationFuel
         PprBase
         PprC
         PprCmm
-        PprCmmZ
-        StackColor
-        StackPlacements
-        ZipCfg
-        ZipCfgCmmRep
-        ZipCfgExtras
-        ZipDataflow
+        PprCmmDecl
+        PprCmmExpr
         Bitmap
         CgBindery
         CgCallConv
@@ -270,6 +262,7 @@ Library
         CoreTidy
         CoreUnfold
         CoreUtils
+        CoqPass
         ExternalCore
         MkCore
         MkExternalCore
@@ -321,6 +314,7 @@ Library
         ErrUtils
         Finder
         GHC
+        GhcMake
         HeaderInfo
         HscMain
         HscStats
@@ -350,6 +344,7 @@ Library
         TysPrim
         TysWiredIn
         CostCentre
+        ProfInit
         SCCfinal
         RnBinds
         RnEnv
@@ -408,11 +403,14 @@ Library
         TcRnTypes
         TcRules
         TcSimplify
+        TcErrors
         TcTyClsDecls
         TcTyDecls
-        TcTyFuns
         TcType
         TcUnify
+        TcInteract
+        TcCanonical
+        TcSMonad
         Class
         Coercion
         FamInstEnv
@@ -420,6 +418,7 @@ Library
         Generics
         InstEnv
         TyCon
+        Kind
         Type
         TypeRep
         Unify
@@ -446,6 +445,7 @@ Library
         MonadUtils
         OrdList
         Outputable
+        Pair
         Panic
         Pretty
         Serialized
@@ -454,11 +454,6 @@ Library
         UniqFM
         UniqSet
         Util
-        VectType
-        VectUtils
-        VectVar
-        Vectorise.Env
-        Vectorise.Vect
         Vectorise.Builtins.Base
         Vectorise.Builtins.Initialise
         Vectorise.Builtins.Modules
@@ -470,12 +465,28 @@ Library
         Vectorise.Monad.Global
         Vectorise.Monad.InstEnv
         Vectorise.Monad
+        Vectorise.Utils.Base
+        Vectorise.Utils.Closure
+        Vectorise.Utils.Hoisting
+        Vectorise.Utils.PADict
+        Vectorise.Utils.Poly
+        Vectorise.Utils
+        Vectorise.Type.Env
+        Vectorise.Type.Repr
+        Vectorise.Type.PData
+        Vectorise.Type.PRepr
+        Vectorise.Type.PADict
+        Vectorise.Type.Type
+        Vectorise.Type.TyConDecl
+        Vectorise.Type.Classify
+        Vectorise.Convert
+        Vectorise.Vect
+        Vectorise.Var
+        Vectorise.Env
+        Vectorise.Exp
         Vectorise
 
-    -- We only need to expose more modules as some of the ncg code is used
-    -- by the LLVM backend so its always included
-    if flag(ncg)
-        Exposed-Modules:
+    Exposed-Modules:
             AsmCodeGen
             TargetReg
             NCGMonad
@@ -485,10 +496,6 @@ Library
             RegClass
             PIC
             Platform
-            Alpha.Regs
-            Alpha.RegInfo
-            Alpha.Instr
-            Alpha.CodeGen
             X86.Regs
             X86.RegInfo
             X86.Instr
@@ -547,7 +554,6 @@ Library
             TcSplice
             Convert
             ByteCodeAsm
-            ByteCodeFFI
             ByteCodeGen
             ByteCodeInstr
             ByteCodeItbls