From 5bb65738e2b135fd1f81dd06e4731f7446d96393 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 26 Mar 2009 13:05:17 +0000 Subject: [PATCH] syb no longer needs to be wired in --- compiler/basicTypes/Module.lhs | 4 +--- compiler/main/Packages.lhs | 1 - compiler/prelude/PrelNames.lhs | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/compiler/basicTypes/Module.lhs b/compiler/basicTypes/Module.lhs index 01fcb7e..9afef94 100644 --- a/compiler/basicTypes/Module.lhs +++ b/compiler/basicTypes/Module.lhs @@ -36,7 +36,6 @@ module Module basePackageId, rtsPackageId, haskell98PackageId, - sybPackageId, thPackageId, dphSeqPackageId, dphParPackageId, @@ -316,7 +315,7 @@ packageIdString = unpackFS . packageIdFS -- Make sure you change 'Packages.findWiredInPackages' if you add an entry here integerPackageId, primPackageId, - basePackageId, rtsPackageId, haskell98PackageId, sybPackageId, + basePackageId, rtsPackageId, haskell98PackageId, thPackageId, dphSeqPackageId, dphParPackageId, mainPackageId :: PackageId primPackageId = fsToPackageId (fsLit "ghc-prim") @@ -324,7 +323,6 @@ 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") dphSeqPackageId = fsToPackageId (fsLit "dph-seq") dphParPackageId = fsToPackageId (fsLit "dph-par") diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs index ce3c064..86b4693 100644 --- a/compiler/main/Packages.lhs +++ b/compiler/main/Packages.lhs @@ -390,7 +390,6 @@ 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 235bc3c..513d81b 100644 --- a/compiler/prelude/PrelNames.lhs +++ b/compiler/prelude/PrelNames.lhs @@ -321,9 +321,6 @@ 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) -- 1.7.10.4