X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FLinker.lhs;h=0ced78eefbe57890e3dbcbc6957efe5bf322bbbc;hb=251fc4cd2669ab3c8621c0ad3419669e090618d1;hp=c566b8f3f52663f30533e863b8241ef40f66ae31;hpb=28a5c73a83e8f27c31cad02da07c81e4e6764303;p=ghc-hetmet.git diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs index c566b8f..0ced78e 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)