diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-08-24 16:00:20 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-08-24 16:00:20 +0000 |
| commit | f871cf1bf889704a4ec1f0063ad4d96f31453ea3 (patch) | |
| tree | 5ef05bebe64fca03c2e19a2b173b138266129858 /compiler/ghci | |
| parent | 7dda6727312f52df2980639bdf4a1a653e74ca8f (diff) | |
| download | haskell-f871cf1bf889704a4ec1f0063ad4d96f31453ea3.tar.gz | |
Follow changes in Cabal: package -> sourcePackageId
Diffstat (limited to 'compiler/ghci')
| -rw-r--r-- | compiler/ghci/Linker.lhs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs index 4c85ac6940..8d0d6bab33 100644 --- a/compiler/ghci/Linker.lhs +++ b/compiler/ghci/Linker.lhs @@ -1024,7 +1024,7 @@ linkPackage dflags pkg let dlls = [ dll | DLL dll <- classifieds ] objs = [ obj | Object obj <- classifieds ] - maybePutStr dflags ("Loading package " ++ display (package pkg) ++ " ... ") + maybePutStr dflags ("Loading package " ++ display (sourcePackageId pkg) ++ " ... ") -- See comments with partOfGHCi when (packageName pkg `notElem` partOfGHCi) $ do @@ -1048,7 +1048,7 @@ linkPackage dflags pkg maybePutStr dflags "linking ... " ok <- resolveObjs if succeeded ok then maybePutStrLn dflags "done." - else ghcError (InstallationError ("unable to load package `" ++ display (package pkg) ++ "'")) + else ghcError (InstallationError ("unable to load package `" ++ display (sourcePackageId pkg) ++ "'")) load_dyn :: [FilePath] -> FilePath -> IO () load_dyn dirs dll = do r <- loadDynamic dirs dll |