diff options
author | Jan Stolarek <jan.stolarek@p.lodz.pl> | 2013-01-16 14:21:07 +0100 |
---|---|---|
committer | David Terei <davidterei@gmail.com> | 2013-01-28 16:09:00 -0800 |
commit | a7f9930a24a91cfb5e2579867e5a0b1d83b5a947 (patch) | |
tree | ceb591a7c38b6b1de8719e204b9343b3e819b714 /compiler/main/GHC.hs | |
parent | 24644bb756950b486f988e0b2d5d55b79d8e1490 (diff) | |
download | haskell-a7f9930a24a91cfb5e2579867e5a0b1d83b5a947.tar.gz |
StaticFlags code cleanup (fixes #7595)
Function responsible for parsing the static flags, that were spread
across two modules (StaticFlags and StaticFlagParser), are now
in one file. This is analogous to dynamic flags parsing, which is
also contained within a single module.
Signed-off-by: David Terei <davidterei@gmail.com>
Diffstat (limited to 'compiler/main/GHC.hs')
-rw-r--r-- | compiler/main/GHC.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs index 40e913ee80..35db120849 100644 --- a/compiler/main/GHC.hs +++ b/compiler/main/GHC.hs @@ -289,8 +289,7 @@ import DriverPhases ( Phase(..), isHaskellSrcFilename ) import Finder import HscTypes import DynFlags -import StaticFlagParser -import qualified StaticFlags +import StaticFlags import SysTools import Annotations import Module @@ -446,7 +445,7 @@ initGhcMonad mb_top_dir = do -- catch ^C liftIO $ installSignalHandlers - liftIO $ StaticFlags.initStaticOpts + liftIO $ initStaticOpts mySettings <- liftIO $ initSysTools mb_top_dir dflags <- liftIO $ initDynFlags (defaultDynFlags mySettings) |