projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-08-13 13:04:50 by simonmar]
[ghc-hetmet.git]
/
ghc
/
compiler
/
ghci
/
Linker.lhs
diff --git
a/ghc/compiler/ghci/Linker.lhs
b/ghc/compiler/ghci/Linker.lhs
index
ffd16e2
..
0849859
100644
(file)
--- a/
ghc/compiler/ghci/Linker.lhs
+++ b/
ghc/compiler/ghci/Linker.lhs
@@
-20,7
+20,7
@@
module Linker ( HValue, showLinkerState,
linkPackages,
) where
linkPackages,
) where
-#include "../includes/config.h"
+#include "../includes/ghcconfig.h"
#include "HsVersions.h"
import ObjLink ( loadDLL, loadObj, unloadObj, resolveObjs, initObjLinker )
#include "HsVersions.h"
import ObjLink ( loadDLL, loadObj, unloadObj, resolveObjs, initObjLinker )
@@
-790,7
+790,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 panic ("can't load package `" ++ name pkg ++ "'")
+ else throwDyn (InstallationError ("unable to load package `" ++ name 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