diff options
| author | Tamar Christina <tamar@zhox.com> | 2016-12-19 19:09:18 +0000 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2016-12-19 19:09:18 +0000 |
| commit | f1dfce1cb2a823696d6d3a9ea41c2bc73d949f12 (patch) | |
| tree | b14692ca8e33e8f925a1fa47542eb3499fc79f0e /compiler/main/GhcMake.hs | |
| parent | bb74bc79daf8b91b21a1b68b0a406828d188ed92 (diff) | |
| download | haskell-f1dfce1cb2a823696d6d3a9ea41c2bc73d949f12.tar.gz | |
Revert "Allow use of the external interpreter in stage1."
This reverts commit 52ba9470a7e85d025dc84a6789aa809cdd68b566.
Diffstat (limited to 'compiler/main/GhcMake.hs')
| -rw-r--r-- | compiler/main/GhcMake.hs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs index be6510bcb2..6b103c9e1b 100644 --- a/compiler/main/GhcMake.hs +++ b/compiler/main/GhcMake.hs @@ -31,7 +31,9 @@ module GhcMake( #include "HsVersions.h" +#ifdef GHCI import qualified Linker ( unload ) +#endif import DriverPhases import DriverPipeline @@ -561,7 +563,13 @@ findPartiallyCompletedCycles modsDone theGraph unload :: HscEnv -> [Linkable] -> IO () unload hsc_env stable_linkables -- Unload everthing *except* 'stable_linkables' = case ghcLink (hsc_dflags hsc_env) of +#ifdef GHCI LinkInMemory -> Linker.unload hsc_env stable_linkables +#else + LinkInMemory -> panic "unload: no interpreter" + -- urgh. avoid warnings: + hsc_env stable_linkables +#endif _other -> return () -- ----------------------------------------------------------------------------- |