hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Setting Opt_BuildingCabalPackage for cabal package.

Browse Source
This commit is contained in:
Kazu Yamamoto 2013-04-02 09:56:57 +09:00
parent 71d3017ec9
commit 7749b1386b
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
GHCApi.hs
View File

@ -46,25 +46,28 @@ withGHC file body = ghandle ignore $ runGhc (Just libdir) $ do
importDirs :: [IncludeDir] importDirs :: [IncludeDir]
importDirs = [".","..","../..","../../..","../../../..","../../../../.."] importDirs = [".","..","../..","../../..","../../../..","../../../../.."]
data Build = CabalPkg | SingleFile deriving Eq
initializeFlagsWithCradle :: Options -> Cradle -> [GHCOption] -> Bool -> Ghc LogReader initializeFlagsWithCradle :: Options -> Cradle -> [GHCOption] -> Bool -> Ghc LogReader
initializeFlagsWithCradle opt cradle ghcOptions logging initializeFlagsWithCradle opt cradle ghcOptions logging
| cabal = do | cabal = do
(gopts,idirs,depPkgs) <- liftIO $ fromCabalFile ghcOptions cradle (gopts,idirs,depPkgs) <- liftIO $ fromCabalFile ghcOptions cradle
initSession opt gopts idirs (Just depPkgs) logging initSession CabalPkg opt gopts idirs (Just depPkgs) logging
| otherwise = | otherwise =
initSession opt ghcOptions importDirs Nothing logging initSession SingleFile opt ghcOptions importDirs Nothing logging
where where
cabal = isJust $ cradleCabalFile cradle cabal = isJust $ cradleCabalFile cradle
---------------------------------------------------------------- ----------------------------------------------------------------
initSession :: Options initSession :: Build
-> Options
-> [GHCOption] -> [GHCOption]
-> [IncludeDir] -> [IncludeDir]
-> Maybe [Package] -> Maybe [Package]
-> Bool -> Bool
-> Ghc LogReader -> Ghc LogReader
initSession opt cmdOpts idirs mDepPkgs logging = do initSession build opt cmdOpts idirs mDepPkgs logging = do
dflags0 <- getSessionDynFlags dflags0 <- getSessionDynFlags
(dflags1,readLog) <- setupDynamicFlags dflags0 (dflags1,readLog) <- setupDynamicFlags dflags0
_ <- setSessionDynFlags dflags1 _ <- setSessionDynFlags dflags1
@ -72,7 +75,7 @@ initSession opt cmdOpts idirs mDepPkgs logging = do
where where
setupDynamicFlags df0 = do setupDynamicFlags df0 = do
df1 <- modifyFlagsWithOpts df0 cmdOpts df1 <- modifyFlagsWithOpts df0 cmdOpts
let df2 = modifyFlags df1 idirs mDepPkgs (expandSplice opt) let df2 = modifyFlags df1 idirs mDepPkgs (expandSplice opt) build
df3 <- modifyFlagsWithOpts df2 $ ghcOpts opt df3 <- modifyFlagsWithOpts df2 $ ghcOpts opt
liftIO $ setLogger logging df3 liftIO $ setLogger logging df3
@ -87,14 +90,19 @@ initializeFlags opt = do
---------------------------------------------------------------- ----------------------------------------------------------------
-- FIXME removing Options -- FIXME removing Options
modifyFlags :: DynFlags -> [IncludeDir] -> Maybe [Package] -> Bool -> DynFlags modifyFlags :: DynFlags -> [IncludeDir] -> Maybe [Package] -> Bool -> Build -> DynFlags
modifyFlags d0 idirs mDepPkgs splice modifyFlags d0 idirs mDepPkgs splice build
| splice = setSplice d3 | splice = setSplice d4
| otherwise = d3 | otherwise = d4
where where
d1 = d0 { importPaths = idirs } d1 = d0 { importPaths = idirs }
d2 = setFastOrNot d1 Fast d2 = setFastOrNot d1 Fast
d3 = maybe d2 (addDevPkgs d2) mDepPkgs d3 = maybe d2 (addDevPkgs d2) mDepPkgs
d4 | build == CabalPkg = setCabalPkg d3
| otherwise = d3
setCabalPkg :: DynFlags -> DynFlags
setCabalPkg dflag = dopt_set dflag Opt_BuildingCabalPackage
setSplice :: DynFlags -> DynFlags setSplice :: DynFlags -> DynFlags
setSplice dflag = dopt_set dflag Opt_D_dump_splices setSplice dflag = dopt_set dflag Opt_D_dump_splices