X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FPackages.lhs;h=078b84c5f2fb0857a5fda97919f9f70580758206;hb=c71662b207222b409ac678b5e6c55d0fec8df2b7;hp=ba51f80f286b526c1e327ee30d5bb7374750ba16;hpb=53f50b718b9c6abcf4d61c95f1e4d355934a2550;p=ghc-hetmet.git

diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs
index ba51f80..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.
@@ -376,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
 
@@ -529,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
 		           }