diff options
| -rw-r--r-- | compiler/basicTypes/Module.lhs | 4 | ||||
| -rw-r--r-- | compiler/main/Packages.lhs | 1 | ||||
| -rw-r--r-- | compiler/prelude/PrelNames.lhs | 5 | ||||
| -rw-r--r-- | libraries/Makefile | 2 | ||||
| -rw-r--r-- | packages | 1 |
5 files changed, 10 insertions, 3 deletions
diff --git a/compiler/basicTypes/Module.lhs b/compiler/basicTypes/Module.lhs index 77c0a936c6..b4f9cd1d43 100644 --- a/compiler/basicTypes/Module.lhs +++ b/compiler/basicTypes/Module.lhs @@ -36,6 +36,7 @@ module Module basePackageId, rtsPackageId, haskell98PackageId, + sybPackageId, thPackageId, ndpPackageId, dphSeqPackageId, @@ -316,7 +317,7 @@ packageIdString = unpackFS . packageIdFS -- Make sure you change 'Packages.findWiredInPackages' if you add an entry here integerPackageId, primPackageId, - basePackageId, rtsPackageId, haskell98PackageId, + basePackageId, rtsPackageId, haskell98PackageId, sybPackageId, thPackageId, ndpPackageId, dphSeqPackageId, dphParPackageId, mainPackageId :: PackageId primPackageId = fsToPackageId (fsLit "ghc-prim") @@ -324,6 +325,7 @@ integerPackageId = fsToPackageId (fsLit "integer") basePackageId = fsToPackageId (fsLit "base") rtsPackageId = fsToPackageId (fsLit "rts") haskell98PackageId = fsToPackageId (fsLit "haskell98") +sybPackageId = fsToPackageId (fsLit "syb") thPackageId = fsToPackageId (fsLit "template-haskell") ndpPackageId = fsToPackageId (fsLit "ndp") dphSeqPackageId = fsToPackageId (fsLit "dph-seq") diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs index 41ca4653ae..7c1b326190 100644 --- a/compiler/main/Packages.lhs +++ b/compiler/main/Packages.lhs @@ -389,6 +389,7 @@ findWiredInPackages dflags pkgs preload this_package = do (basePackageId, [""]), (rtsPackageId, [""]), (haskell98PackageId, [""]), + (sybPackageId, [""]), (thPackageId, [""]), (dphSeqPackageId, [""]), (dphParPackageId, [""]), diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs index b5f1eef050..efba489856 100644 --- a/compiler/prelude/PrelNames.lhs +++ b/compiler/prelude/PrelNames.lhs @@ -272,7 +272,7 @@ gHC_TOP_HANDLER = mkBaseModule (fsLit "GHC.TopHandler") sYSTEM_IO = mkBaseModule (fsLit "System.IO") dYNAMIC = mkBaseModule (fsLit "Data.Dynamic") tYPEABLE = mkBaseModule (fsLit "Data.Typeable") -gENERICS = mkBaseModule (fsLit "Data.Generics.Basics") +gENERICS = mkSybModule (fsLit "Data.Generics.Basics") dOTNET = mkBaseModule (fsLit "GHC.Dotnet") rEAD_PREC = mkBaseModule (fsLit "Text.ParserCombinators.ReadPrec") lEX = mkBaseModule (fsLit "Text.Read.Lex") @@ -314,6 +314,9 @@ mkBaseModule m = mkModule basePackageId (mkModuleNameFS m) mkBaseModule_ :: ModuleName -> Module mkBaseModule_ m = mkModule basePackageId m +mkSybModule :: FastString -> Module +mkSybModule m = mkModule sybPackageId (mkModuleNameFS m) + mkMainModule :: FastString -> Module mkMainModule m = mkModule mainPackageId (mkModuleNameFS m) diff --git a/libraries/Makefile b/libraries/Makefile index 55c31808f5..a2729dcaf9 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 concurrent unique timeout st getopt base3-compat array packedstring +SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base syb concurrent unique timeout st getopt base3-compat array packedstring SUBDIRS += containers bytestring old-locale old-time filepath ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix @@ -24,6 +24,7 @@ libraries/packedstring packages/packedstring darcs libraries/pretty packages/pretty darcs libraries/process packages/process darcs libraries/random packages/random darcs +libraries/syb packages/syb darcs libraries/st packages/st darcs libraries/template-haskell packages/template-haskell darcs libraries/timeout packages/timeout darcs |