diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-08-23 22:29:41 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-08-23 22:29:41 +0000 |
| commit | b816369636e9a7a16a9dee9195054fdc852c5285 (patch) | |
| tree | c6c5d9cf51dc0d769c60d2bc0d22c584b5d11571 | |
| parent | bd72e9436d244c09946a7795c41c4b4b62dd53a5 (diff) | |
| download | haskell-b816369636e9a7a16a9dee9195054fdc852c5285.tar.gz | |
st is now split off from base
| -rw-r--r-- | compiler/ghc.cabal | 19 | ||||
| -rw-r--r-- | ghc/ghc-bin.cabal | 2 | ||||
| -rw-r--r-- | libraries/Makefile | 2 | ||||
| -rw-r--r-- | packages | 1 |
4 files changed, 18 insertions, 6 deletions
diff --git a/compiler/ghc.cabal b/compiler/ghc.cabal index 88b04d1c30..8d37b58e94 100644 --- a/compiler/ghc.cabal +++ b/compiler/ghc.cabal @@ -14,6 +14,9 @@ Category: XXX Build-Type: Simple Cabal-Version: >= 1.2 +Flag base4 + Description: Choose the even newer, even smaller, split-up base package. + Flag base3 Description: Choose the new smaller, split-up base package. @@ -35,16 +38,24 @@ Flag stage1 Library Exposed: False + if flag(base4) + Build-Depends: base >= 4 && < 5 if flag(base3) - Build-Depends: base >= 3 && < 5, - directory >= 1 && < 1.1, + Build-Depends: base >= 3 && < 4 + if !flag(base3) && !flag(base4) + Build-Depends: base < 3 + + if flag(base4) + Build-Depends: st >= 0.1 && < 0.2 + + if flag(base3) || flag(base4) + Build-Depends: directory >= 1 && < 1.1, process >= 1 && < 1.1, bytestring >= 0.9 && < 0.10, old-time >= 1 && < 1.1, containers >= 0.1 && < 0.2, array >= 0.1 && < 0.2 - else - Build-Depends: base < 3 + Build-Depends: filepath >= 1 && < 1.2 Build-Depends: haskell98, Cabal, hpc if os(windows) diff --git a/ghc/ghc-bin.cabal b/ghc/ghc-bin.cabal index 95059c72d5..ede227bd5f 100644 --- a/ghc/ghc-bin.cabal +++ b/ghc/ghc-bin.cabal @@ -25,7 +25,7 @@ Flag ghci Executable ghc Main-Is: Main.hs if flag(base3) - Build-Depends: base >= 3 && < 4, + Build-Depends: base >= 3 && < 5, directory >= 1 && < 1.1 else Build-Depends: base < 3 diff --git a/libraries/Makefile b/libraries/Makefile index 2d68868ede..85c9b5955c 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -41,7 +41,7 @@ include $(TOP)/mk/cabal-flags.mk # Any libraries listed here should also be in ../packages -SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base base3-compat array packedstring +SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base st base3-compat array packedstring SUBDIRS += containers bytestring old-locale old-time filepath ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix @@ -22,6 +22,7 @@ libraries/packedstring packages/packedstring darcs libraries/pretty packages/pretty darcs libraries/process packages/process darcs libraries/random packages/random darcs +libraries/st packages/st darcs libraries/template-haskell packages/template-haskell darcs libraries/unix packages/unix darcs libraries/Win32 packages/Win32 darcs |