From: Ian Lynagh <igloo@earth.li>
Date: Sun, 11 May 2008 00:52:53 +0000 (+0000)
Subject: Follow Cabal changes in ghci/Linker
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=814d2f506d63f785dbfe33189dde606a06e60285;ds=sidebyside

Follow Cabal changes in ghci/Linker
---

diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs
index 2f72dfd..3bb208f 100644
--- a/compiler/ghci/Linker.lhs
+++ b/compiler/ghci/Linker.lhs
@@ -1019,7 +1019,7 @@ linkPackage dflags pkg
 	let dlls = [ dll | DLL dll    <- classifieds ]
 	    objs = [ obj | Object obj <- classifieds ]
 
-	maybePutStr dflags ("Loading package " ++ showPackageId (package pkg) ++ " ... ")
+	maybePutStr dflags ("Loading package " ++ display (package pkg) ++ " ... ")
 
 	-- See comments with partOfGHCi
 	when (pkgName (package pkg) `notElem` partOfGHCi) $ do
@@ -1043,7 +1043,7 @@ linkPackage dflags pkg
         maybePutStr dflags "linking ... "
         ok <- resolveObjs
 	if succeeded ok then maybePutStrLn dflags "done."
-	      else throwDyn (InstallationError ("unable to load package `" ++ showPackageId (package pkg) ++ "'"))
+	      else throwDyn (InstallationError ("unable to load package `" ++ display (package pkg) ++ "'"))
 
 load_dyn dirs dll = do r <- loadDynamic dirs dll
 		       case r of