diff options
| -rw-r--r-- | compiler/ghc.cabal | 3 | ||||
| -rw-r--r-- | libraries/Makefile | 2 | ||||
| -rw-r--r-- | packages | 3 | ||||
| -rw-r--r-- | utils/ghc-pkg/ghc-pkg.cabal | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/compiler/ghc.cabal b/compiler/ghc.cabal index 8d37b58e94..b1de64ef69 100644 --- a/compiler/ghc.cabal +++ b/compiler/ghc.cabal @@ -46,7 +46,8 @@ Library Build-Depends: base < 3 if flag(base4) - Build-Depends: st >= 0.1 && < 0.2 + Build-Depends: concurrent >= 0.1 && < 0.2, + st >= 0.1 && < 0.2 if flag(base3) || flag(base4) Build-Depends: directory >= 1 && < 1.1, diff --git a/libraries/Makefile b/libraries/Makefile index e78a5c815f..43216ba4d4 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 st getopt base3-compat array packedstring +SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base concurrent unique timeout st getopt base3-compat array packedstring SUBDIRS += containers bytestring old-locale old-time filepath ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix @@ -8,6 +8,7 @@ libraries/base packages/base darcs libraries/base3-compat packages/base3-compat darcs libraries/bytestring packages/bytestring darcs libraries/Cabal packages/Cabal darcs +libraries/concurrent packages/concurrent darcs libraries/containers packages/containers darcs libraries/directory packages/directory darcs libraries/editline packages/editline darcs @@ -25,6 +26,8 @@ libraries/process packages/process darcs libraries/random packages/random darcs libraries/st packages/st darcs libraries/template-haskell packages/template-haskell darcs +libraries/timeout packages/timeout darcs +libraries/unique packages/unique darcs libraries/unix packages/unix darcs libraries/Win32 packages/Win32 darcs libraries/HUnit extralibs packages/HUnit darcs diff --git a/utils/ghc-pkg/ghc-pkg.cabal b/utils/ghc-pkg/ghc-pkg.cabal index 1e862a7cd5..0ab3534179 100644 --- a/utils/ghc-pkg/ghc-pkg.cabal +++ b/utils/ghc-pkg/ghc-pkg.cabal @@ -31,7 +31,8 @@ Executable ghc-pkg Build-Depends: base < 3 if flag(base4) - Build-Depends: getopt >= 0.1 && < 0.2 + Build-Depends: concurrent >= 0.1 && < 0.2, + getopt >= 0.1 && < 0.2 if flag(base3) || flag(base4) Build-Depends: directory >= 1 && < 1.1, |