diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-06-18 21:25:14 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-06-18 21:41:09 +0100 |
| commit | ee7c4f434d377396dc9054fb5c1d9c899cc3b287 (patch) | |
| tree | a1c2302069ea39e9208d878cbd840cff5761f66a /ghc | |
| parent | e6e3a960b23efa683bc04203d794e867a6c1bb27 (diff) | |
| download | haskell-ee7c4f434d377396dc9054fb5c1d9c899cc3b287.tar.gz | |
Make -ignore-dot-ghci a dynamic flag
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/InteractiveUI.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs index 9d3ff20b9a..c56f5067f9 100644 --- a/ghc/InteractiveUI.hs +++ b/ghc/InteractiveUI.hs @@ -49,7 +49,6 @@ import Linker import Maybes ( orElse, expectJust ) import NameSet import Panic hiding ( showException ) -import StaticFlags import Util -- Haskell Libraries @@ -389,8 +388,9 @@ withGhcAppData right left = do runGHCi :: [(FilePath, Maybe Phase)] -> Maybe [String] -> GHCi () runGHCi paths maybe_exprs = do + dflags <- getDynFlags let - read_dot_files = not opt_IgnoreDotGhci + read_dot_files = not (dopt Opt_IgnoreDotGhci dflags) current_dir = return (Just ".ghci") @@ -431,7 +431,6 @@ runGHCi paths maybe_exprs = do setGHCContextFromGHCiState - dflags <- getDynFlags when (read_dot_files) $ do mcfgs0 <- sequence $ [ current_dir, app_user_dir, home_dir ] ++ map (return . Just ) (ghciScripts dflags) mcfgs <- liftIO $ mapM canonicalizePath' (catMaybes mcfgs0) |