Commit f2254213 authored by Ian Lynagh's avatar Ian Lynagh

Remove the no-ghci-lib warning in ghc-pkg

GHCi libs are no longer necessary, as we can use the .a or .so versions
instead.
parent b2adc501
......@@ -1320,7 +1320,7 @@ checkHSLib dirs auto_ghci_libs lib = do
case m of
Nothing -> verror ForceFiles ("cannot find " ++ batch_lib_file ++
" on library path")
Just dir -> liftIO $ checkGHCiLib dirs dir batch_lib_file lib auto_ghci_libs
Just dir -> liftIO $ checkGHCiLib dir batch_lib_file lib auto_ghci_libs
doesFileExistOnPath :: String -> [FilePath] -> IO (Maybe FilePath)
doesFileExistOnPath file path = go path
......@@ -1346,13 +1346,10 @@ checkModules pkg = do
when (isNothing m) $
verror ForceFiles ("file " ++ file ++ " is missing")
checkGHCiLib :: [String] -> String -> String -> String -> Bool -> IO ()
checkGHCiLib dirs batch_lib_dir batch_lib_file lib auto_build
checkGHCiLib :: String -> String -> String -> Bool -> IO ()
checkGHCiLib batch_lib_dir batch_lib_file lib auto_build
| auto_build = autoBuildGHCiLib batch_lib_dir batch_lib_file ghci_lib_file
| otherwise = do
m <- doesFileExistOnPath ghci_lib_file dirs
when (isNothing m && ghci_lib_file /= "HSrts.o") $
warn ("warning: can't find GHCi lib " ++ ghci_lib_file)
| otherwise = return ()
where
ghci_lib_file = lib <.> "o"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment