Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/027f282584409008ccae6e1d68d22d649b42ad9e >--------------------------------------------------------------- commit 027f282584409008ccae6e1d68d22d649b42ad9e Author: Ian Lynagh <[email protected]> Date: Sun Apr 1 01:35:46 2012 +0100 Tidy up compiler/ghc.cabal.in We now always have base4, and don't need a workaround for GHC 6.4.2. >--------------------------------------------------------------- compiler/ghc.cabal.in | 36 ++++++++++-------------------------- 1 files changed, 10 insertions(+), 26 deletions(-) diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index 20a2e47..4f22f85 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -20,12 +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 @@ -54,26 +48,20 @@ 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.2, + process >= 1 && < 1.2, + bytestring >= 0.9 && < 0.11, + time < 1.5, + containers >= 0.1 && < 0.6, + array >= 0.1 && < 0.5, + filepath >= 1 && < 1.4, + Cabal, + hpc 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 @@ -89,10 +77,6 @@ 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, _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
