diff options
| -rw-r--r-- | ghc/GHCi/UI.hs | 7 | ||||
| -rw-r--r-- | ghc/GHCi/UI/Monad.hs | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs index 13275f8d42..105324f629 100644 --- a/ghc/GHCi/UI.hs +++ b/ghc/GHCi/UI.hs @@ -1430,8 +1430,11 @@ changeDirectory dir = do dflags <- getDynFlags -- With -fexternal-interpreter, we have to change the directory of the subprocess too. -- (this gives consistent behaviour with and without -fexternal-interpreter) - when (gopt Opt_ExternalInterpreter dflags) $ - lift $ enqueueCommands ["System.Directory.setCurrentDirectory " ++ show dir'] + when (gopt Opt_ExternalInterpreter dflags) $ do + hsc_env <- GHC.getSession + fhv <- compileGHCiExpr $ + "System.Directory.setCurrentDirectory " ++ show dir' + liftIO $ evalIO hsc_env fhv trySuccess :: GHC.GhcMonad m => m SuccessFlag -> m SuccessFlag trySuccess act = diff --git a/ghc/GHCi/UI/Monad.hs b/ghc/GHCi/UI/Monad.hs index 45a52712da..a3c21d8c01 100644 --- a/ghc/GHCi/UI/Monad.hs +++ b/ghc/GHCi/UI/Monad.hs @@ -24,6 +24,8 @@ module GHCi.UI.Monad ( printForUserNeverQualify, printForUserModInfo, printForUser, printForUserPartWay, prettyLocations, + + compileGHCiExpr, initInterpBuffering, turnOffBuffering, turnOffBuffering_, flushInterpBuffers, |