1 files changed, 15 insertions, 6 deletions

diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in
index 9b622e1107..87b2c4e2fd 100644
--- a/libraries/ghci/ghci.cabal.in
+++ b/libraries/ghci/ghci.cabal.in
@@ -17,6 +17,11 @@ cabal-version:  >=1.10
 build-type:     Simple
 extra-source-files: changelog.md
 
+Flag ghci
+    Description: Build GHCi support.
+    Default: False
+    Manual: True
+
 source-repository head
     type:     git
     location: http://git.haskell.org/ghc.git
@@ -41,24 +46,28 @@ library
         TupleSections
         UnboxedTuples
 
+    if flag(ghci)
+        CPP-Options: -DGHCI
+        exposed-modules:
+            GHCi.Run
+            GHCi.CreateBCO
+            GHCi.ObjLink
+            GHCi.Signals
+            GHCi.TH
+
     exposed-modules:
         GHCi.BreakArray
         GHCi.Message
         GHCi.ResolvedBCO
         GHCi.RemoteTypes
-        GHCi.ObjLink
-        GHCi.CreateBCO
         GHCi.FFI
         GHCi.InfoTable
-        GHCi.Run
-        GHCi.Signals
-        GHCi.TH
         GHCi.TH.Binary
         SizedSeq
 
     Build-Depends:
         array            == 0.5.*,
-        base             == 4.10.*,
+        base             >= 4.8 && < 4.11,
         binary           == 0.8.*,
         bytestring       == 0.10.*,
         containers       == 0.5.*,