[project @ 2004-03-08 16:08:52 by simonmar]

Apply $libdir hack to GHCi libs in the same way as ordinary .a libs.

diff --git a/ghc/utils/ghc-pkg/Main.hs b/ghc/utils/ghc-pkg/Main.hs
index d0f8d3a..c5ec0d5 100644 (file)
--- a/ghc/utils/ghc-pkg/Main.hs
+++ b/ghc/utils/ghc-pkg/Main.hs
@@ -351,7 +351,7 @@ doesLibExistIn lib d
 checkGHCiLib :: [String] -> String -> String -> String -> Bool -> IO ()
 checkGHCiLib dirs batch_lib_dir batch_lib_file lib auto_build = do
   let ghci_lib_file = lib ++ ".o"
-  bs <- mapM (\d -> doesFileExist (d ++ '/':ghci_lib_file)) dirs
+  bs <- mapM (doesLibExistIn ghci_lib_file) dirs
   case [ dir | (exists,dir) <- zip bs dirs, exists ] of
         [] | auto_build -> 
                autoBuildGHCiLib batch_lib_dir batch_lib_file ghci_lib_file