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

set Opt_SpecConstr just in case.

Browse Source
This commit is contained in:
Kazu Yamamoto 2014-07-18 10:52:57 +09:00
parent 2f0c8b1293
commit 0ce70ae22d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Language/Haskell/GhcMod/DynFlags.hs
View File

@ -1,16 +1,14 @@
module Language.Haskell.GhcMod.DynFlags where module Language.Haskell.GhcMod.DynFlags where
import qualified Language.Haskell.GhcMod.Gap as Gap
import Language.Haskell.GhcMod.Types
import Control.Applicative ((<$>)) import Control.Applicative ((<$>))
import Control.Monad (forM, void, (>=>)) import Control.Monad (forM, void, (>=>))
import DynFlags (ExtensionFlag(..), xopt, GeneralFlag(..), gopt_unset)
import GHC (DynFlags(..), GhcMode(..), GhcLink(..), HscTarget(..), LoadHowMuch(..)) import GHC (DynFlags(..), GhcMode(..), GhcLink(..), HscTarget(..), LoadHowMuch(..))
import qualified GHC as G import qualified GHC as G
import GhcMonad
import GHC.Paths (libdir) import GHC.Paths (libdir)
import DynFlags (ExtensionFlag(..), xopt) import GhcMonad
import qualified Language.Haskell.GhcMod.Gap as Gap
import Language.Haskell.GhcMod.Types
import System.IO.Unsafe (unsafePerformIO) import System.IO.Unsafe (unsafePerformIO)
data Build = CabalPkg | SingleFile deriving Eq data Build = CabalPkg | SingleFile deriving Eq
@ -42,6 +40,9 @@ setModeIntelligent df = df {
, optLevel = 0 , optLevel = 0
} }
setFlags :: DynFlags -> DynFlags
setFlags df = df `gopt_unset` Opt_SpecConstr -- consume memory if -O2
setIncludeDirs :: [IncludeDir] -> DynFlags -> DynFlags setIncludeDirs :: [IncludeDir] -> DynFlags -> DynFlags
setIncludeDirs idirs df = df { importPaths = idirs } setIncludeDirs idirs df = df { importPaths = idirs }

1
Language/Haskell/GhcMod/Monad.hs
View File

@ -190,6 +190,7 @@ initSession build Options {..} CompilerOptions {..} = do
df <- G.getSessionDynFlags df <- G.getSessionDynFlags
void $ G.setSessionDynFlags =<< addCmdOpts ghcOptions void $ G.setSessionDynFlags =<< addCmdOpts ghcOptions
( setModeSimple ( setModeSimple
$ setFlags
$ setIncludeDirs includeDirs $ setIncludeDirs includeDirs
$ setBuildEnv build $ setBuildEnv build
$ setEmptyLogger $ setEmptyLogger