Some -dynamic-too fixes
[ghc.git] / compiler / ghc.cabal.in
index cdacbf4..a69e25e 100644 (file)
@@ -20,17 +20,6 @@ Category: Development
 Build-Type: Simple
 Cabal-Version: >= 1.2.3
 
-Flag base4
-    Description: Choose the even newer, even smaller, split-up base package.
-
-Flag base3
-    Description: Choose the new smaller, split-up base package.
-
-Flag dynlibs
-    Description: Dynamic library support
-    Default: False
-    Manual: True
-
 Flag ghci
     Description: Build GHCi support.
     Default: False
@@ -54,32 +43,27 @@ Flag stage3
 Library
     Exposed: False
 
-    if flag(base4)
-        Build-Depends: base       >= 4   && < 5
-    if flag(base3)
-        Build-Depends: base       >= 3   && < 4
-    if !flag(base3) && !flag(base4)
-        Build-Depends: base       < 3
+    Build-Depends: base       >= 4   && < 5,
+                   directory  >= 1   && < 1.3,
+                   process    >= 1   && < 1.3,
+                   bytestring >= 0.9 && < 0.11,
+                   time                 < 1.5,
+                   containers >= 0.1 && < 0.6,
+                   array      >= 0.1 && < 0.5,
+                   filepath   >= 1   && < 1.4,
+                   Cabal,
+                   hpc,
+                   transformers
 
     if flag(stage1) && impl(ghc < 7.5)
         Build-Depends: old-time   >= 1   && < 1.2
 
-    if flag(base3) || flag(base4)
-        Build-Depends: directory  >= 1   && < 1.2,
-                       process    >= 1   && < 1.2,
-                       bytestring >= 0.9 && < 0.11,
-                       time                 < 1.5,
-                       containers >= 0.1 && < 0.6,
-                       array      >= 0.1 && < 0.5
-
-    Build-Depends: filepath >= 1 && < 1.4
-    Build-Depends: Cabal, hpc
     if os(windows)
         Build-Depends: Win32
     else
         Build-Depends: unix
 
-    GHC-Options: -Wall -fno-warn-name-shadowing -fno-warn-orphans
+    GHC-Options: -Wall -fno-warn-name-shadowing
 
     if flag(ghci)
         Build-Depends: template-haskell
@@ -89,14 +73,10 @@ Library
     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
-    Include-Dirs: ../libraries/base/cbits, ../libraries/base/include
-
     Extensions: CPP, MagicHash, UnboxedTuples, PatternGuards,
                 ForeignFunctionInterface, EmptyDataDecls,
                 TypeSynonymInstances, MultiParamTypeClasses,
-                FlexibleInstances, Rank2Types, ScopedTypeVariables,
+                FlexibleInstances, RankNTypes, ScopedTypeVariables,
                 DeriveDataTypeable, BangPatterns
     if impl(ghc >= 7.1)
         Extensions: NondecreasingIndentation
@@ -116,11 +96,9 @@ Library
 
     c-sources:
         parser/cutils.c
-        utils/md5.c
 
-    if flag(dynlibs)
-        c-sources:
-            ghci/keepCAFsForGHCi.c
+    c-sources:
+        ghci/keepCAFsForGHCi.c
 
     hs-source-dirs:
         basicTypes
@@ -190,7 +168,6 @@ Library
         CmmCallConv
         CmmCommonBlockElim
         CmmContFlowOpt
-        CmmCvt
         CmmExpr
         CmmInfo
         CmmLex
@@ -201,41 +178,26 @@ Library
         CmmOpt
         CmmParse
         CmmProcPoint
-        CmmSpillReload
         CmmRewriteAssignments
-        CmmStackLayout
+        CmmSink
         CmmType
         CmmUtils
+        CmmLayoutStack
         MkGraph
-        OldCmm
-        OldCmmUtils
-        OldPprCmm
-        OptimizationFuel
         PprBase
         PprC
         PprCmm
         PprCmmDecl
         PprCmmExpr
         Bitmap
-        CgBindery
-        CgCallConv
-        CgCase
-        CgClosure
-        CgCon
-        CgExpr
-        CgExtCode
-        CgForeignCall
-        CgHeapery
-        CgHpc
-        CgInfoTbls
-        CgLetNoEscape
-        CgMonad
-        CgParallel
-        CgPrimOp
-        CgProf
-        CgStackery
-        CgTailCall
-        CgTicky
+        CodeGen.Platform
+        CodeGen.Platform.ARM
+        CodeGen.Platform.NoRegs
+        CodeGen.Platform.PPC
+        CodeGen.Platform.PPC_Darwin
+        CodeGen.Platform.SPARC
+        CodeGen.Platform.X86
+        CodeGen.Platform.X86_64
         CgUtils
         StgCmm
         StgCmmBind
@@ -253,8 +215,7 @@ Library
         StgCmmProf
         StgCmmTicky
         StgCmmUtils
-        ClosureInfo
-        CodeGen
+        StgCmmExtCode
         SMRep
         CoreArity
         CoreFVs
@@ -328,9 +289,9 @@ Library
         InteractiveEval
         PackageConfig
         Packages
+        PlatformConstants
         PprTyThing
         StaticFlags
-        StaticFlagParser
         SysTools
         TidyPgm
         Ctype
@@ -356,7 +317,6 @@ Library
         RnEnv
         RnExpr
         RnHsDoc
-        RnHsSyn
         RnNames
         RnPat
         RnSource
@@ -374,9 +334,9 @@ Library
         SimplMonad
         SimplUtils
         Simplify
-        SRT
         SimplStg
         StgStats
+        UnariseStg
         Rules
         SpecConstr
         Specialise
@@ -403,6 +363,7 @@ Library
         TcHsType
         TcInstDcls
         TcMType
+        TcValidity
         TcMatches
         TcPat
         TcRnDriver
@@ -420,12 +381,12 @@ Library
         TcCanonical
         TcSMonad
         Class
-        IParam
         Coercion
         FamInstEnv
         FunDeps
         InstEnv
         TyCon
+        CoAxiom
         Kind
         Type
         TypeRep
@@ -457,6 +418,7 @@ Library
         Pretty
         Serialized
         State
+        Stream
         StringBuffer
         UniqFM
         UniqSet
@@ -490,6 +452,11 @@ Library
         Vectorise.Env
         Vectorise.Exp
         Vectorise
+        Hoopl.Dataflow
+        Hoopl
+
+--        CgInfoTbls used in ghci/DebuggerUtils
+--        CgHeapery  mkVirtHeapOffsets used in ghci
 
     Exposed-Modules:
             AsmCodeGen
@@ -516,7 +483,6 @@ Library
             PPC.CodeGen
             SPARC.Base
             SPARC.Regs
-            SPARC.RegPlate
             SPARC.Imm
             SPARC.AddrMode
             SPARC.Cond
@@ -550,6 +516,7 @@ Library
             RegAlloc.Linear.StackMap
             RegAlloc.Linear.Base
             RegAlloc.Linear.X86.FreeRegs
+            RegAlloc.Linear.X86_64.FreeRegs
             RegAlloc.Linear.PPC.FreeRegs
             RegAlloc.Linear.SPARC.FreeRegs