diff options
Diffstat (limited to 'compiler/main/HscMain.hs')
| -rw-r--r-- | compiler/main/HscMain.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs index 7807f653e3..7617dc87a3 100644 --- a/compiler/main/HscMain.hs +++ b/compiler/main/HscMain.hs @@ -101,6 +101,7 @@ import VarEnv ( emptyTidyEnv ) import THNames ( templateHaskellNames ) import Panic import ConLike +import Control.Concurrent #endif import Module @@ -160,7 +161,6 @@ import Stream (Stream) import Util import Data.List -import Control.Concurrent import Control.Monad import Data.IORef import System.FilePath as FilePath @@ -182,7 +182,9 @@ newHscEnv dflags = do us <- mkSplitUniqSupply 'r' nc_var <- newIORef (initNameCache us allKnownKeyNames) fc_var <- newIORef emptyModuleEnv +#ifdef GHCI iserv_mvar <- newMVar Nothing +#endif return HscEnv { hsc_dflags = dflags , hsc_targets = [] , hsc_mod_graph = [] @@ -1594,7 +1596,7 @@ hscImport hsc_env str = runInteractiveHsc hsc_env $ do [L _ i] -> return i _ -> liftIO $ throwOneError $ mkPlainErrMsg (hsc_dflags hsc_env) noSrcSpan $ - ptext (sLit "parse error in import declaration") + text "parse error in import declaration" -- | Typecheck an expression (but don't run it) -- Returns its most general type |