From: sof <unknown>
Date: Wed, 8 May 2002 07:26:36 +0000 (+0000)
Subject: [project @ 2002-05-08 07:26:36 by sof]
X-Git-Tag: Approx_11550_changesets_converted~2047
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=c1ee74d8665d16ae85ec19bb6f16b0972b374148

[project @ 2002-05-08 07:26:36 by sof]
summarise{File}: filter out GHC.Prim from import lists
---

diff --git a/ghc/compiler/compMan/CompManager.lhs b/ghc/compiler/compMan/CompManager.lhs
index 68f5411..449801c 100644
--- a/ghc/compiler/compMan/CompManager.lhs
+++ b/ghc/compiler/compMan/CompManager.lhs
@@ -77,6 +77,7 @@ import HscTypes hiding ( moduleNameToModule )
 import Name		( Name, NamedThing(..), nameRdrName, nameModule,
 			  isHomePackageName, isExternalName )
 import NameEnv
+import PrelNames        ( gHC_PRIM_Name )
 import Rename		( mkGlobalContext )
 import RdrName		( emptyRdrEnv )
 import Module
@@ -1230,6 +1231,8 @@ summariseFile file
         (srcimps,imps,mod_name) <- getImportsFromFile hspp_fn
 
         let (path, basename, _ext) = splitFilename3 file
+	     -- GHC.Prim doesn't exist physically, so don't go looking for it.
+            the_imps = filter (/= gHC_PRIM_Name) imps
 
 	(mod, location)
 	   <- mkHomeModuleLocn mod_name (path ++ '/':basename) file
@@ -1241,7 +1244,7 @@ summariseFile file
 
         return (ModSummary mod
                            location{ml_hspp_file=Just hspp_fn}
-                           srcimps imps src_timestamp)
+                           srcimps the_imps src_timestamp)
 
 -- Summarise a module, and pick up source and timestamp.
 summarise :: Module -> ModuleLocation -> Maybe ModSummary
@@ -1264,6 +1267,9 @@ summarise mod location old_summary
 
         hspp_fn <- preprocess hs_fn
         (srcimps,imps,mod_name) <- getImportsFromFile hspp_fn
+	let
+	     -- GHC.Prim doesn't exist physically, so don't go looking for it.
+           the_imps = filter (/= gHC_PRIM_Name) imps
 
 	when (mod_name /= moduleName mod) $
 		throwDyn (ProgramError 
@@ -1272,7 +1278,7 @@ summarise mod location old_summary
 			      <+> quotes (ppr (moduleName mod)))))
 
         return (Just (ModSummary mod location{ml_hspp_file=Just hspp_fn} 
-                                 srcimps imps src_timestamp))
+                                 srcimps the_imps src_timestamp))
         }
       }