X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FLinker.lhs;h=3d30c07f133787afc4a4667287860b699a4aeaee;hb=8ddc86a0af37093d6939a30f0912753c88d5ad0e;hp=8ad2be8d99e8b293204f45fa77c4f887e3f948ce;hpb=2df88d37ccd23e42f04b43237ac1f42d315d47f8;p=ghc-hetmet.git

diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs
index 8ad2be8..3d30c07 100644
--- a/compiler/ghci/Linker.lhs
+++ b/compiler/ghci/Linker.lhs
@@ -78,7 +78,6 @@ import System.Directory
 import Distribution.Package hiding (depends, PackageId)
 
 import Exception
-import Data.Maybe
 \end{code}
 
 
@@ -414,7 +413,7 @@ reallyInitDynLinker dflags
 	; ok <- resolveObjs
 
 	; if succeeded ok then maybePutStrLn dflags "done"
-	  else ghcError (InstallationError "linking extra libraries/objects failed")
+	  else ghcError (ProgramError "linking extra libraries/objects failed")
 	}}
 
 classifyLdInput :: FilePath -> IO (Maybe LibrarySpec)
@@ -638,8 +637,7 @@ getLinkDeps hsc_env hpt _ maybe_normal_osuf span mods
 
     get_linkable maybe_normal_osuf mod_name	-- A home-package module
 	| Just mod_info <- lookupUFM hpt mod_name 
-	= ASSERT(isJust (hm_linkable mod_info))
-	  adjust_linkable (fromJust (hm_linkable mod_info))
+	= adjust_linkable (Maybes.expectJust "getLinkDeps" (hm_linkable mod_info))
 	| otherwise	
 	= do	-- It's not in the HPT because we are in one shot mode, 
 		-- so use the Finder to get a ModLocation...