diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2011-04-30 14:26:48 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2011-04-30 14:26:48 +0100 |
| commit | 224ef3094189bc9a33f23285b5dccbffdd8d7de0 (patch) | |
| tree | 551c816c8c8f7df25f060f27de82c16b00f7d2c5 /compiler/main/GHC.hs | |
| parent | fdf8656855d26105ff36bdd24d41827b05037b91 (diff) | |
| parent | d1bffa693adfa48ef65240bb3c097f5f5f77868e (diff) | |
| download | haskell-224ef3094189bc9a33f23285b5dccbffdd8d7de0.tar.gz | |
Merge remote branch 'origin/master' into ghc-new-co
Conflicts:
compiler/typecheck/TcErrors.lhs
compiler/typecheck/TcSMonad.lhs
compiler/typecheck/TcType.lhs
compiler/types/TypeRep.lhs
Diffstat (limited to 'compiler/main/GHC.hs')
| -rw-r--r-- | compiler/main/GHC.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs index db8887a47a..44ec3ff26b 100644 --- a/compiler/main/GHC.hs +++ b/compiler/main/GHC.hs @@ -430,8 +430,8 @@ initGhcMonad mb_top_dir = do liftIO $ StaticFlags.initStaticOpts - dflags0 <- liftIO $ initDynFlags defaultDynFlags - dflags <- liftIO $ initSysTools mb_top_dir dflags0 + mySettings <- liftIO $ initSysTools mb_top_dir + dflags <- liftIO $ initDynFlags (defaultDynFlags mySettings) env <- liftIO $ newHscEnv dflags setSession env |