X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FPackages.lhs;h=078b84c5f2fb0857a5fda97919f9f70580758206;hb=922de8ca1aa3f2a1796e8cfa9bf8e52d7b959d9b;hp=fb54a1291fbf6cca5fc7f8c146533c348820ae64;hpb=046ee54f048ddd721dcee41916d6a6f68db3b15b;p=ghc-hetmet.git

diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs
index fb54a12..078b84c 100644
--- a/compiler/main/Packages.lhs
+++ b/compiler/main/Packages.lhs
@@ -107,9 +107,6 @@ import Control.Exception        ( throwDyn )
 -- in a different DLL, by setting the DLL flag.
 
 data PackageState = PackageState {
-  origPkgIdMap		:: PackageConfigMap, -- PackageId   -> PackageConfig
-        -- The on-disk package database
-
   pkgIdMap		:: PackageConfigMap, -- PackageId   -> PackageConfig
 	-- The exposed flags are adjusted according to -package and
 	-- -hide-package flags, and -ignore-package removes packages.
@@ -167,7 +164,8 @@ initPackages dflags = do
                 Just db -> return db
   (pkg_state, preload, this_pkg)       
         <- mkPackageState dflags pkg_db [] (thisPackage dflags)
-  return (dflags{ pkgState = pkg_state,
+  return (dflags{ pkgDatabase = Just pkg_db,
+		  pkgState = pkg_state,
                   thisPackage = this_pkg },
           preload)
 
@@ -375,7 +373,8 @@ findWiredInPackages dflags pkgs preload this_package = do
 	wired_in_pkgids = [ basePackageId,
 			    rtsPackageId,
 			    haskell98PackageId,
-			    thPackageId ]
+			    thPackageId,
+                            ndpPackageId ]
 
 	wired_in_names = map packageIdString wired_in_pkgids
 
@@ -528,7 +527,6 @@ mkPackageState dflags orig_pkg_db preload0 this_package = do
   let new_dep_preload = filter (`notElem` preload0) dep_preload
 
   let pstate = PackageState{ preloadPackages     = dep_preload,
-                             origPkgIdMap        = orig_pkg_db,
 		             pkgIdMap   	 = pkg_db,
 		             moduleToPkgConfAll  = mkModuleMap pkg_db
 		           }