X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghc.cabal.in;h=c4be998be02637a1961f90d1c1f6f28dbbae0382;hp=ec87c4ae5a567d405dc9f9c28690cdaab0ed3f80;hb=d9a655dad8e013e41c74dca98fb86c4ed6f29879;hpb=f9288086f935c97812b2d80defcff38baf7b6a6c diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index ec87c4a..c4be998 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -18,7 +18,7 @@ Description: through this package. Category: Development Build-Type: Simple -Cabal-Version: >= 1.2 +Cabal-Version: >= 1.2.3 Flag base4 Description: Choose the even newer, even smaller, split-up base package. @@ -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,15 +62,15 @@ 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.3, - array >= 0.1 && < 0.3 + containers >= 0.1 && < 0.5, + array >= 0.1 && < 0.4 - Build-Depends: filepath >= 1 && < 1.2 - Build-Depends: haskell98, Cabal, hpc + Build-Depends: filepath >= 1 && < 1.3 + Build-Depends: Cabal, hpc if os(windows) Build-Depends: Win32 else @@ -85,8 +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 @@ -96,15 +94,14 @@ Library ForeignFunctionInterface, EmptyDataDecls, TypeSynonymInstances, MultiParamTypeClasses, FlexibleInstances, Rank2Types, ScopedTypeVariables, - DeriveDataTypeable, RelaxedPolyRec + DeriveDataTypeable + if impl(ghc >= 7.1) + Extensions: NondecreasingIndentation Include-Dirs: . parser utils if flag(stage1) Include-Dirs: stage1 - if impl(ghc < 6.9) - Build-Depends: extensible-exceptions - Extensions: PatternSignatures else if flag(stage2) Include-Dirs: stage2 @@ -127,12 +124,13 @@ Library cmm codeGen coreSyn - cprAnalysis deSugar ghci hsSyn iface + llvmGen main + nativeGen parser prelude profiling @@ -152,15 +150,26 @@ Library DataCon Demand Exception + GhcMonad Id IdInfo Literal + Llvm + Llvm.AbsSyn + Llvm.PpLlvm + Llvm.Types + LlvmCodeGen + LlvmCodeGen.Base + LlvmCodeGen.CodeGen + LlvmCodeGen.Data + LlvmCodeGen.Ppr + LlvmCodeGen.Regs + LlvmMangler MkId Module Name NameEnv NameSet - NewDemand OccName RdrName SrcLoc @@ -172,44 +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 @@ -217,6 +220,7 @@ Library CgClosure CgCon CgExpr + CgExtCode CgForeignCall CgHeapery CgHpc @@ -258,12 +262,12 @@ Library CoreTidy CoreUnfold CoreUtils + CoqPass ExternalCore MkCore MkExternalCore PprCore PprExternalCore - CprAnalyse Check Coverage Desugar @@ -310,6 +314,7 @@ Library ErrUtils Finder GHC + GhcMake HeaderInfo HscMain HscStats @@ -317,18 +322,16 @@ Library InteractiveEval PackageConfig Packages - ParsePkgConf PprTyThing StaticFlags StaticFlagParser SysTools TidyPgm Ctype - HaddockLex - HaddockParse HaddockUtils LexCore Lexer + OptCoercion Parser ParserCore ParserCoreUtils @@ -341,6 +344,7 @@ Library TysPrim TysWiredIn CostCentre + ProfInit SCCfinal RnBinds RnEnv @@ -374,9 +378,6 @@ Library StgLint StgSyn DmdAnal - SaAbsInt - SaLib - StrictAnal WorkWrap WwLib FamInst @@ -402,11 +403,14 @@ Library TcRnTypes TcRules TcSimplify + TcErrors TcTyClsDecls TcTyDecls - TcTyFuns TcType TcUnify + TcInteract + TcCanonical + TcSMonad Class Coercion FamInstEnv @@ -414,6 +418,7 @@ Library Generics InstEnv TyCon + Kind Type TypeRep Unify @@ -435,12 +440,12 @@ Library GraphPpr IOEnv Interval - LazyUniqFM ListSetOps Maybes MonadUtils OrdList Outputable + Pair Panic Pretty Serialized @@ -449,18 +454,39 @@ Library UniqFM UniqSet Util - VectBuiltIn - VectCore - VectMonad - VectType - VectUtils + Vectorise.Builtins.Base + Vectorise.Builtins.Initialise + Vectorise.Builtins.Modules + Vectorise.Builtins.Prelude + Vectorise.Builtins + Vectorise.Monad.Base + Vectorise.Monad.Naming + Vectorise.Monad.Local + 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 - if flag(ncg) - hs-source-dirs: - nativeGen - - Exposed-Modules: + Exposed-Modules: AsmCodeGen TargetReg NCGMonad @@ -468,13 +494,8 @@ Library Size Reg RegClass - PprBase PIC Platform - Alpha.Regs - Alpha.RegInfo - Alpha.Instr - Alpha.CodeGen X86.Regs X86.RegInfo X86.Instr @@ -491,10 +512,10 @@ Library SPARC.Regs SPARC.RegPlate SPARC.Imm - SPARC.AddrMode + SPARC.AddrMode SPARC.Cond SPARC.Instr - SPARC.Stack + SPARC.Stack SPARC.ShortcutJump SPARC.Ppr SPARC.CodeGen @@ -533,7 +554,6 @@ Library TcSplice Convert ByteCodeAsm - ByteCodeFFI ByteCodeGen ByteCodeInstr ByteCodeItbls