Unverified Commit 09026349 authored by Vaibhav Sagar's avatar Vaibhav Sagar Committed by GitHub

IHaskell.Eval.Util: handle GHC environment files in `initGhci` (#1280)

parent f842343a
...@@ -279,7 +279,13 @@ doc sdoc = do ...@@ -279,7 +279,13 @@ doc sdoc = do
initGhci :: GhcMonad m => Maybe String -> m () initGhci :: GhcMonad m => Maybe String -> m ()
initGhci sandboxPackages = do initGhci sandboxPackages = do
-- Initialize dyn flags. Start with -XExtendedDefaultRules and -XNoMonomorphismRestriction. -- Initialize dyn flags. Start with -XExtendedDefaultRules and -XNoMonomorphismRestriction.
#if MIN_VERSION_ghc(9,0,0)
-- We start handling GHC environment files
originalFlagsNoPackageEnv <- getSessionDynFlags
originalFlags <- liftIO $ interpretPackageEnv originalFlagsNoPackageEnv
#else
originalFlags <- getSessionDynFlags originalFlags <- getSessionDynFlags
#endif
let flag = flip xopt_set let flag = flip xopt_set
unflag = flip xopt_unset unflag = flip xopt_unset
dflags = flag ExtendedDefaultRules . unflag MonomorphismRestriction $ originalFlags dflags = flag ExtendedDefaultRules . unflag MonomorphismRestriction $ originalFlags
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment