projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e25d509
)
Follow Cabal changes in ghci/Linker
author
Ian Lynagh
<igloo@earth.li>
Sun, 11 May 2008 00:52:53 +0000
(
00:52
+0000)
committer
Ian Lynagh
<igloo@earth.li>
Sun, 11 May 2008 00:52:53 +0000
(
00:52
+0000)
compiler/ghci/Linker.lhs
patch
|
blob
|
history
diff --git
a/compiler/ghci/Linker.lhs
b/compiler/ghci/Linker.lhs
index
2f72dfd
..
3bb208f
100644
(file)
--- 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 ]
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
-- 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."
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
load_dyn dirs dll = do r <- loadDynamic dirs dll
case r of