X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghc.cabal.in;h=b3d9f0cd2a442716d4a7d7729f85e15ec4da2df7;hp=a5f2a851ba9ed4cc0099c7a8bf6a482a350fc4da;hb=18691d440f90a3dff4ef538091c886af505e5cf5;hpb=1a24ae99d0a7c0a2c6d8104b20405a69da9b9754 diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index a5f2a85..b3d9f0c 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,7 +62,7 @@ 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, @@ -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,37 @@ Library BlockId CLabel Cmm - CmmBrokenBlock CmmBuildInfoTables CmmCPS - CmmCPSGen - CmmCPSZ CmmCallConv - CmmCommonBlockElimZ + CmmCommonBlockElim CmmContFlowOpt CmmCvt + CmmDecl CmmExpr CmmInfo CmmLex CmmLint CmmLive - CmmLiveZ + CmmMachOp + CmmNode CmmOpt CmmParse CmmProcPoint - CmmProcPointZ CmmSpillReload 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 @@ -321,6 +312,7 @@ Library ErrUtils Finder GHC + GhcMake HeaderInfo HscMain HscStats @@ -350,6 +342,7 @@ Library TysPrim TysWiredIn CostCentre + ProfInit SCCfinal RnBinds RnEnv @@ -408,11 +401,14 @@ Library TcRnTypes TcRules TcSimplify + TcErrors TcTyClsDecls TcTyDecls - TcTyFuns TcType TcUnify + TcInteract + TcCanonical + TcSMonad Class Coercion FamInstEnv @@ -420,6 +416,7 @@ Library Generics InstEnv TyCon + Kind Type TypeRep Unify @@ -446,6 +443,7 @@ Library MonadUtils OrdList Outputable + Pair Panic Pretty Serialized @@ -454,20 +452,6 @@ Library UniqFM UniqSet Util - VectType - VectUtils - Vectorise.Var - Vectorise.Convert - Vectorise.Env - Vectorise.Vect - Vectorise.Exp - Vectorise.Type.Type - Vectorise.Type.TyConDecl - Vectorise.Type.Classify - Vectorise.Type.Repr - Vectorise.Type.PADict - Vectorise.Utils.Closure - Vectorise.Utils.Hoisting Vectorise.Builtins.Base Vectorise.Builtins.Initialise Vectorise.Builtins.Modules @@ -479,12 +463,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 @@ -494,10 +494,6 @@ Library RegClass PIC Platform - Alpha.Regs - Alpha.RegInfo - Alpha.Instr - Alpha.CodeGen X86.Regs X86.RegInfo X86.Instr @@ -556,7 +552,6 @@ Library TcSplice Convert ByteCodeAsm - ByteCodeFFI ByteCodeGen ByteCodeInstr ByteCodeItbls