import path fall back.

This commit is contained in:
Kazu Yamamoto
2011-10-18 12:22:48 +09:00
parent 15c3d74f6d
commit a07ce7edcc
2 changed files with 11 additions and 7 deletions

View File

@@ -17,12 +17,15 @@ import Types
----------------------------------------------------------------
importDirs :: [String]
importDirs = ["..","../..","../../..","../../../..","../../../../.."]
initializeGHC :: Options -> FilePath -> [String] -> Bool -> Ghc (FilePath,LogReader)
initializeGHC opt fileName ghcOptions logging = do
(owdir,mdirfile) <- liftIO getDirs
case mdirfile of
Nothing -> do
logReader <- initSession opt ghcOptions Nothing logging
logReader <- initSession opt ghcOptions importDirs logging
return (fileName,logReader)
Just (cdir,cfile) -> do
midirs <- parseCabalFile cfile
@@ -31,7 +34,7 @@ initializeGHC opt fileName ghcOptions logging = do
Nothing -> [cdir,owdir]
Just dirs -> dirs ++ [owdir]
file = ajustFileName fileName owdir cdir
logReader <- initSession opt ghcOptions (Just idirs) logging
logReader <- initSession opt ghcOptions idirs logging
return (file,logReader)
----------------------------------------------------------------