[project @ 2001-07-24 04:46:37 by ken]

[ghc-hetmet.git] / ghc / compiler / rename / RnHiFiles.lhs

diff --git a/ghc/compiler/rename/RnHiFiles.lhs b/ghc/compiler/rename/RnHiFiles.lhs
index c1f2788..c7ea623 100644 (file)
--- a/ghc/compiler/rename/RnHiFiles.lhs
+++ b/ghc/compiler/rename/RnHiFiles.lhs
@@ -482,7 +482,8 @@ findAndReadIface doc_str mod_name hi_boot_file
     -- and start up GHCi - it won't complain that all the modules it tries
     -- to load are found in the home location.
     ioToRnM_no_fail (readIORef v_GhcMode) `thenRn` \ mode ->
-    let home_allowed = mode `notElem` [ DoInteractive, DoLink ]
+    let home_allowed = hi_boot_file ||
+                      mode `notElem` [ DoInteractive, DoMake ]
     in
 
     ioToRnM (if home_allowed 
@@ -634,7 +635,7 @@ hiModuleNameMismatchWarn requested_mod read_mod =
 
 packageNameMismatchWarn :: Module -> Module  -> Message
 packageNameMismatchWarn requested_mod read_mod = 
-    sep [ ptext SLIT("Module"), quotes (ppr requested_mod), 
+    fsep [ ptext SLIT("Module"), quotes (ppr requested_mod), 
          ptext SLIT("is located in package"), 
          quotes (ptext (modulePackage requested_mod)),
          ptext SLIT("but its interface file claims it is part of package"),