summaryrefslogtreecommitdiff
path: root/compiler/ghci
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2008-07-24 15:16:14 +0000
committerSimon Marlow <marlowsd@gmail.com>2008-07-24 15:16:14 +0000
commit251fc4cd2669ab3c8621c0ad3419669e090618d1 (patch)
tree0b1cc2eda99942a056bf33d6409f4720993c8b12 /compiler/ghci
parent1aa4db5e6883b4ffa6ea0f9c3450c0c15e40f543 (diff)
downloadhaskell-251fc4cd2669ab3c8621c0ad3419669e090618d1.tar.gz
small cleanup
Diffstat (limited to 'compiler/ghci')
-rw-r--r--compiler/ghci/Linker.lhs5
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs
index c566b8f3f5..0ced78eefb 100644
--- a/compiler/ghci/Linker.lhs
+++ b/compiler/ghci/Linker.lhs
@@ -1085,7 +1085,7 @@ locateOneObj dirs lib
Nothing ->
do { mb_lib_path <- findFile mk_dyn_lib_path dirs
; case mb_lib_path of
- Just _ -> return (DLL (lib ++ "-ghc" ++ cProjectVersion))
+ Just _ -> return (DLL dyn_lib_name)
Nothing -> return (DLL lib) }} -- We assume
| otherwise
-- When the GHC package was compiled as dynamic library (=__PIC__ set),
@@ -1100,7 +1100,8 @@ locateOneObj dirs lib
Nothing -> return (DLL lib) }} -- We assume
where
mk_obj_path dir = dir </> (lib <.> "o")
- mk_dyn_lib_path dir = dir </> mkSOName (lib ++ "-ghc" ++ cProjectVersion)
+ dyn_lib_name = lib ++ "-ghc" ++ cProjectVersion
+ mk_dyn_lib_path dir = dir </> mkSOName dyn_lib_name
-- ----------------------------------------------------------------------------
-- Loading a dyanmic library (dlopen()-ish on Unix, LoadLibrary-ish on Win32)