From: simonpj <unknown>
Date: Fri, 25 Oct 2002 11:33:27 +0000 (+0000)
Subject: [project @ 2002-10-25 11:33:27 by simonpj]
X-Git-Tag: Approx_11550_changesets_converted~1514
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=0abcbf0f5afda9cc067ddcf2c28b463d59d24a1e;p=ghc-hetmet.git

[project @ 2002-10-25 11:33:27 by simonpj]
Wibble; cures failure in stage2 build
---

diff --git a/ghc/compiler/typecheck/TcRnTypes.lhs b/ghc/compiler/typecheck/TcRnTypes.lhs
index 17c3e0a..beff457 100644
--- a/ghc/compiler/typecheck/TcRnTypes.lhs
+++ b/ghc/compiler/typecheck/TcRnTypes.lhs
@@ -521,9 +521,14 @@ plusImportAvails
 		   dep_pkgs   = nub (dpkgs1 ++ dpkgs2)	 }
   where
     plus_mod_dep (m1, orphan1, boot1) (m2, orphan2, boot2) 
-	= ASSERT( m1 == m2 && orphan1 == orphan2 )
-	  (m1, orphan1, boot1 && boot2)
+	= WARN( not (m1 == m2 && (boot1 || boot2 || orphan1 == orphan2)), 
+	        (ppr m1 <+> ppr m2) $$ (ppr orphan1 <+> ppr orphan2) $$ (ppr boot1 <+> ppr boot2) )
+		-- Check mod-names match, and orphan-hood matches; but a boot interface
+		-- might not know about orphan hood, so only check the orphan match
+		-- if both are non-boot interfaces
+	  (m1, orphan1 || orphan2, boot1 && boot2)
 	-- If either side can "see" a non-hi-boot interface, use that
+	-- Similarly orphan-hood (see note about about why orphan1 and 2 might differ)
 \end{code}
 
 %************************************************************************