From f1dfce1cb2a823696d6d3a9ea41c2bc73d949f12 Mon Sep 17 00:00:00 2001
From: Tamar Christina <tamar@zhox.com>
Date: Mon, 19 Dec 2016 19:09:18 +0000
Subject: Revert "Allow use of the external interpreter in stage1."

This reverts commit 52ba9470a7e85d025dc84a6789aa809cdd68b566.
---
 compiler/ghc.cabal.in | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'compiler/ghc.cabal.in')

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 99bb463f54..4875753a1c 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -64,7 +64,6 @@ Library
                    transformers == 0.5.*,
                    ghc-boot   == @ProjectVersionMunged@,
                    ghc-boot-th == @ProjectVersionMunged@,
-                   ghci == @ProjectVersionMunged@,
                    hoopl      >= 3.10.2 && < 3.11
 
     if os(windows)
@@ -74,6 +73,9 @@ Library
             Build-Depends: terminfo == 0.4.*
         Build-Depends: unix   == 2.7.*
 
+    if flag(ghci)
+        Build-Depends: ghci == @ProjectVersionMunged@
+
     GHC-Options: -Wall -fno-warn-name-shadowing
 
     if flag(ghci)
@@ -603,6 +605,16 @@ Library
             Dwarf
             Dwarf.Types
             Dwarf.Constants
+
+    if !flag(stage1)
+        -- ghc:Serialized moved to ghc-boot:GHC.Serialized.  So for
+        -- compatibility with GHC 7.10 and earlier, we reexport it
+        -- under the old name.
+        reexported-modules:
+            ghc-boot:GHC.Serialized as Serialized
+
+    if flag(ghci)
+        Exposed-Modules:
             Convert
             ByteCodeTypes
             ByteCodeAsm
@@ -615,10 +627,3 @@ Library
             RtClosureInspect
             DebuggerUtils
             GHCi
-
-    if !flag(stage1)
-        -- ghc:Serialized moved to ghc-boot:GHC.Serialized.  So for
-        -- compatibility with GHC 7.10 and earlier, we reexport it
-        -- under the old name.
-        reexported-modules:
-            ghc-boot:GHC.Serialized as Serialized
-- 
cgit v1.2.1