Rename ghci flag into internal-interpreter

"ghci" as a flag name was confusing because it really enables the
internal-interpreter. Even the ghci library had a "ghci" flag...

7 files changed, 22 insertions, 21 deletions

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index f0f5a638d4..7694cfa2ec 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -23,8 +23,8 @@ Category: Development
 Build-Type: Simple
 Cabal-Version: >=1.10
 
-Flag ghci
-    Description: Build GHCi support.
+Flag internal-interpreter
+    Description: Build with internal interpreter support.
     Default: False
     Manual: True
 
@@ -88,7 +88,7 @@ Library
                  -Wnoncanonical-monad-instances
                  -Wnoncanonical-monoid-instances
 
-    if flag(ghci)
+    if flag(internal-interpreter)
         CPP-Options: -DHAVE_INTERNAL_INTERPRETER
         Include-Dirs: ../rts/dist/build @FFIIncludeDir@
 
diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index bd5fdde71f..6a0a937053 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -203,7 +203,7 @@ compiler_stage1_CONFIGURE_OPTS += --ghc-option=-optc-DTHREADED_RTS
 endif
 
 ifeq "$(GhcWithInterpreter)" "YES"
-compiler_stage2_CONFIGURE_OPTS += --flags=ghci
+compiler_stage2_CONFIGURE_OPTS += --flags=internal-interpreter
 
 # Should the debugger commands be enabled?
 ifeq "$(GhciWithDebugger)" "YES"
diff --git a/ghc.mk b/ghc.mk
index 5c9479e6a3..ec4115973a 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -598,7 +598,7 @@ endif
 BOOT_LIBS = $(foreach lib,$(PACKAGES_STAGE0),$(libraries/$(lib)_dist-boot_v_LIB))
 
 # Only build internal interpreter support for the stage2 ghci lib
-libraries/ghci_dist-install_CONFIGURE_OPTS += --flags=ghci
+libraries/ghci_dist-install_CONFIGURE_OPTS += --flags=internal-interpreter
 
 # ----------------------------------------
 # Special magic for the ghc-prim package
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index cc6864b0fa..bc111dbf98 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -19,8 +19,8 @@ Data-Files: settings
 Build-Type: Simple
 Cabal-Version: >=1.10
 
-Flag ghci
-    Description: Build GHCi support.
+Flag internal-interpreter
+    Description: Build with internal interpreter support.
     Default: False
     Manual: True
 
@@ -55,7 +55,7 @@ Executable ghc
                  -Wnoncanonical-monad-instances
                  -Wnoncanonical-monoid-instances
 
-    if flag(ghci)
+    if flag(internal-interpreter)
         -- NB: this is never built by the bootstrapping GHC+libraries
         Build-depends:
             deepseq        == 1.4.*,
@@ -102,4 +102,4 @@ Executable ghc
     Default-Extensions:
         NoImplicitPrelude
       , ScopedTypeVariables
-      , BangPatterns
\ No newline at end of file
+      , BangPatterns
diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 5512d50710..0e479a24bc 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -19,8 +19,8 @@ ghc_stage2_CONFIGURE_OPTS += --flags=stage2
 ghc_stage3_CONFIGURE_OPTS += --flags=stage3
 
 ifeq "$(GhcWithInterpreter)" "YES"
-ghc_stage2_CONFIGURE_OPTS += --flags=ghci
-ghc_stage3_CONFIGURE_OPTS += --flags=ghci
+ghc_stage2_CONFIGURE_OPTS += --flags=internal-interpreter
+ghc_stage3_CONFIGURE_OPTS += --flags=internal-interpreter
 endif
 
 # This package doesn't pass the Cabal checks because data-dir
diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs
index 026758b2b7..e40d5115ef 100644
--- a/hadrian/src/Settings/Packages.hs
+++ b/hadrian/src/Settings/Packages.hs
@@ -73,7 +73,7 @@ packageArgs = do
               notStage0 ? arg "--ghc-pkg-option=--force" ]
 
           , builder (Cabal Flags) ? mconcat
-            [ ghcWithInterpreter ? notStage0 ? arg "ghci"
+            [ ghcWithInterpreter ? notStage0 ? arg "internal-interpreter"
             , cross ? arg "-terminfo"
             ]
 
@@ -84,7 +84,7 @@ packageArgs = do
           [ builder Ghc ? arg ("-I" ++ compilerPath)
 
           , builder (Cabal Flags) ? mconcat
-            [ ghcWithInterpreter ? notStage0 ? arg "ghci"
+            [ ghcWithInterpreter ? notStage0 ? arg "internal-interpreter"
             , cross ? arg "-terminfo"
             -- Note [Linking ghc-bin against threaded stage0 RTS]
             -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -121,13 +121,13 @@ packageArgs = do
 
         --------------------------------- ghci ---------------------------------
         , package ghci ? mconcat
-          [ notStage0 ? builder (Cabal Flags) ? arg "ghci"
+          [ notStage0 ? builder (Cabal Flags) ? arg "internal-interpreter"
 
-          -- The use case here is that we want to build @ghc-proxy@ for the
+          -- The use case here is that we want to build @iserv-proxy@ for the
           -- cross compiler. That one needs to be compiled by the bootstrap
           -- compiler as it needs to run on the host. Hence @libiserv@ needs
           -- @GHCi.TH@, @GHCi.Message@ and @GHCi.Run@ from @ghci@. And those are
-          -- behind the @-fghci@ flag.
+          -- behind the @-finternal-interpreter@ flag.
           --
           -- But it may not build if we have made some changes to ghci's
           -- dependencies (see #16051).
@@ -142,13 +142,14 @@ packageArgs = do
           --
           -- The workaround we use is to check if the bootstrap compiler has
           -- the same version as the one we are building. In this case we can
-          -- avoid the first step above and directly build with `-fghci`.
+          -- avoid the first step above and directly build with
+          -- `-finternal-interpreter`.
           --
           -- TODO: Note that in that case we also do not need to build most of
           -- the Stage1 libraries, as we already know that the bootstrap
           -- compiler comes with the same versions as the one we are building.
           --
-          , cross ? stage0 ? bootCross ? builder (Cabal Flags) ? arg "ghci"
+          , cross ? stage0 ? bootCross ? builder (Cabal Flags) ? arg "internal-interpreter"
 
           ]
 
diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in
index c160c8c0e3..1661bf213a 100644
--- a/libraries/ghci/ghci.cabal.in
+++ b/libraries/ghci/ghci.cabal.in
@@ -17,8 +17,8 @@ cabal-version:  >=1.10
 build-type:     Simple
 extra-source-files: changelog.md
 
-Flag ghci
-    Description: Build GHCi support.
+Flag internal-interpreter
+    Description: Build with internal interpreter support.
     Default: False
     Manual: True
 
@@ -47,7 +47,7 @@ library
         TupleSections
         UnboxedTuples
 
-    if flag(ghci)
+    if flag(internal-interpreter)
         CPP-Options: -DHAVE_INTERNAL_INTERPRETER
         exposed-modules:
             GHCi.Run