X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghc.cabal.in;h=0711a93ccb4a485e9ae73376bea4ca810bd6f77a;hp=b37165805a609170009628c0d25053fd2bf45d12;hb=edc0bafd3fcd01b85a2e8894e5dfe149eb0e0857;hpb=25ea332f16464c3f9b0f45bd37cfd418dde5fe92 diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index b371658..0711a93 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -1,3 +1,6 @@ +-- WARNING: ghc.cabal is automatically generated from ghc.cabal.in by +-- ./configure. Make sure you are editing ghc.cabal.in, not ghc.cabal. + Name: ghc Version: @ProjectVersion@ License: BSD3 @@ -15,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. @@ -28,11 +31,6 @@ Flag dynlibs Default: False Manual: True -Flag editline - Description: Use editline - Default: False - Manual: True - Flag ghci Description: Build GHCi support. Default: False @@ -45,6 +43,15 @@ Flag ncg Flag stage1 Description: Is this stage 1? + Default: False + +Flag stage2 + Description: Is this stage 2? + Default: False + +Flag stage3 + Description: Is this stage 3? + Default: False Library Exposed: False @@ -57,24 +64,20 @@ 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 Build-Depends: unix - if flag(editline) - Build-Depends: editline - CPP-Options: -DUSE_EDITLINE - GHC-Options: -Wall -fno-warn-name-shadowing -fno-warn-orphans if flag(ghci) @@ -85,6 +88,8 @@ Library if !flag(ncg) CPP-Options: -DOMIT_NATIVE_CODEGEN + Build-Depends: bin-package-db + -- 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 @@ -93,17 +98,19 @@ Library ForeignFunctionInterface, EmptyDataDecls, TypeSynonymInstances, MultiParamTypeClasses, FlexibleInstances, Rank2Types, ScopedTypeVariables, - DeriveDataTypeable, RelaxedPolyRec + DeriveDataTypeable Include-Dirs: . parser utils if flag(stage1) Include-Dirs: stage1 - if impl(ghc < 6.9) - Build-Depends: extensible-exceptions - Extensions: PatternSignatures else - Include-Dirs: stage2plus + if flag(stage2) + Include-Dirs: stage2 + else + if flag(stage3) + Include-Dirs: stage2 + Install-Includes: HsVersions.h, ghc_boot_platform.h c-sources: @@ -119,12 +126,13 @@ Library cmm codeGen coreSyn - cprAnalysis deSugar ghci hsSyn iface + llvmGen main + nativeGen parser prelude profiling @@ -144,15 +152,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 @@ -193,6 +212,7 @@ Library MkZipCfg MkZipCfgCmm OptimizationFuel + PprBase PprC PprCmm PprCmmZ @@ -209,6 +229,7 @@ Library CgClosure CgCon CgExpr + CgExtCode CgForeignCall CgHeapery CgHpc @@ -255,7 +276,6 @@ Library MkExternalCore PprCore PprExternalCore - CprAnalyse Check Coverage Desugar @@ -309,18 +329,16 @@ Library InteractiveEval PackageConfig Packages - ParsePkgConf PprTyThing StaticFlags StaticFlagParser SysTools TidyPgm Ctype - HaddockLex - HaddockParse HaddockUtils LexCore Lexer + OptCoercion Parser ParserCore ParserCoreUtils @@ -366,9 +384,6 @@ Library StgLint StgSyn DmdAnal - SaAbsInt - SaLib - StrictAnal WorkWrap WwLib FamInst @@ -394,11 +409,14 @@ Library TcRnTypes TcRules TcSimplify + TcErrors TcTyClsDecls TcTyDecls - TcTyFuns TcType TcUnify + TcInteract + TcCanonical + TcSMonad Class Coercion FamInstEnv @@ -427,7 +445,6 @@ Library GraphPpr IOEnv Interval - LazyUniqFM ListSetOps Maybes MonadUtils @@ -441,17 +458,43 @@ 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.PRDict + Vectorise.Utils.Poly + Vectorise.Utils + Vectorise.Type.Env + Vectorise.Type.Repr + Vectorise.Type.PData + Vectorise.Type.PRepr + Vectorise.Type.PADict + Vectorise.Type.PRDict + 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) - hs-source-dirs: - nativeGen - Exposed-Modules: AsmCodeGen TargetReg @@ -460,7 +503,6 @@ Library Size Reg RegClass - PprBase PIC Platform Alpha.Regs @@ -483,10 +525,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 @@ -497,6 +539,7 @@ Library SPARC.CodeGen.Gen32 SPARC.CodeGen.Gen64 SPARC.CodeGen.Sanity + SPARC.CodeGen.Expand RegAlloc.Liveness RegAlloc.Graph.Main RegAlloc.Graph.Stats @@ -530,9 +573,6 @@ Library ByteCodeItbls ByteCodeLink Debugger - GhciMonad - GhciTags - InteractiveUI LibFFI Linker ObjLink