diff options
| author | Artem Pelenitsyn <a.pelenitsyn@gmail.com> | 2020-05-03 04:56:59 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-05-13 20:04:11 -0400 |
| commit | d880d6b2e48268f5ed4d3eb751fe24cc833e9221 (patch) | |
| tree | 619cd0162576e8f502e96d8ea883f64aa386d980 /compiler/GHC.hs | |
| parent | d7e0b57fda289e2715e7be86d4871503e3c09ee8 (diff) | |
| download | haskell-d880d6b2e48268f5ed4d3eb751fe24cc833e9221.tar.gz | |
Don't reload environment files on every setSessionDynFlags
Makes `interpretPackageEnv` (which loads envirinment files) a part of
`parseDynamicFlags` (parsing command-line arguments, which is typically
done once) instead of `setSessionDynFlags` (which is typically called
several times). Making several (transitive) calls to `interpretPackageEnv`,
as before, caused #18125 #16318, which should be fixed now.
Diffstat (limited to 'compiler/GHC.hs')
| -rw-r--r-- | compiler/GHC.hs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/compiler/GHC.hs b/compiler/GHC.hs index 19c5b59901..b92f0de3f0 100644 --- a/compiler/GHC.hs +++ b/compiler/GHC.hs @@ -597,8 +597,7 @@ checkBrokenTablesNextToCode' dflags setSessionDynFlags :: GhcMonad m => DynFlags -> m [UnitId] setSessionDynFlags dflags = do dflags' <- checkNewDynFlags dflags - dflags'' <- liftIO $ interpretPackageEnv dflags' - (dflags''', preload) <- liftIO $ initPackages dflags'' + (dflags''', preload) <- liftIO $ initPackages dflags' -- Interpreter interp <- if gopt Opt_ExternalInterpreter dflags @@ -715,7 +714,11 @@ getInteractiveDynFlags = withSession $ \h -> return (ic_dflags (hsc_IC h)) parseDynamicFlags :: MonadIO m => DynFlags -> [Located String] -> m (DynFlags, [Located String], [Warn]) -parseDynamicFlags = parseDynamicFlagsCmdLine +parseDynamicFlags dflags cmdline = do + (dflags1, leftovers, warns) <- parseDynamicFlagsCmdLine dflags cmdline + dflags2 <- liftIO $ interpretPackageEnv dflags1 + return (dflags2, leftovers, warns) + -- | Checks the set of new DynFlags for possibly erroneous option -- combinations when invoking 'setSessionDynFlags' and friends, and if |