Commit 814d2f50 authored by Ian Lynagh's avatar Ian Lynagh

Follow Cabal changes in ghci/Linker

parent e25d5095
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment