diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-03-23 18:25:57 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-03-23 18:25:57 +0000 |
| commit | fcf6b22d0478be20e27c2245f3e34dd272e12522 (patch) | |
| tree | 7b33e0ecfddef9bd27f963b13e332baca0ae4db4 /libraries | |
| parent | 7f0471be1cfe0ef6110ef7fdd8132d85387d0b21 (diff) | |
| download | haskell-fcf6b22d0478be20e27c2245f3e34dd272e12522.tar.gz | |
Follow library changes
Integer, Bool and Unit/Inl/Inr are now in new packages integer
and ghc-prim.
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/Makefile | 5 | ||||
| -rw-r--r-- | libraries/boot-packages | 4 | ||||
| -rw-r--r-- | libraries/installPackage.hs | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index c854108a18..9617dd4e08 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -38,7 +38,7 @@ show: TOP=.. include $(TOP)/mk/boilerplate.mk -SUBDIRS = base array packedstring containers bytestring +SUBDIRS = ghc-prim integer-gmp base array packedstring containers bytestring SUBDIRS += old-locale old-time filepath directory ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix @@ -322,7 +322,8 @@ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ $(CABAL_HADDOCK_FLAGS); \ fi ifneq "$(HSCOLOUR)" "" - if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/$*/src/; fi +# We use */src rather than $*/src due to the integer-gmp/integer mismatch + if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/*/src/; fi endif .PHONY: distclean clean clean.library.% diff --git a/libraries/boot-packages b/libraries/boot-packages index 940683d004..6ffb54eb34 100644 --- a/libraries/boot-packages +++ b/libraries/boot-packages @@ -6,7 +6,10 @@ containers directory editline filepath +ghc-prim haskell98 +hpc +integer-gmp old-locale old-time packedstring @@ -16,4 +19,3 @@ random template-haskell unix Win32 -hpc diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs index df2a9e20d3..4615429560 100644 --- a/libraries/installPackage.hs +++ b/libraries/installPackage.hs @@ -40,7 +40,7 @@ doRegisterInplace verbosity = do lbi <- getConfig verbosity let registerFlags = defaultRegisterFlags { regInPlace = toFlag True } pd = localPkgDescr lbi - pd_reg = if pkgName (package pd) == "base" + pd_reg = if pkgName (package pd) == "ghc-prim" then case library pd of Just lib -> let ems = "GHC.Prim" : exposedModules lib @@ -75,9 +75,9 @@ doInstall verbosity ghcpkg ghcpkgconf destdir topdir let pd = localPkgDescr lbi i = installDirTemplates lbi -- This is an almighty hack. We need to register - -- base:GHC.Prim, but it doesn't exist, get built, get + -- ghc-prim:GHC.Prim, but it doesn't exist, get built, get -- haddocked, get copied, etc. - pd_reg = if pkgName (package pd) == "base" + pd_reg = if pkgName (package pd) == "ghc-prim" then case library pd of Just lib -> let ems = "GHC.Prim" : exposedModules lib |