diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-09-15 12:05:11 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-09-16 04:54:38 -0400 |
| commit | b695e7d73617ab19170d37b383315e8ede289c5e (patch) | |
| tree | 21e449b1385d785f859f8cb5ff93b8fc7244c581 /ghc | |
| parent | ce42e187ebfc81174ed477f247f023ae094c9b24 (diff) | |
| download | haskell-b695e7d73617ab19170d37b383315e8ede289c5e.tar.gz | |
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...
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/ghc-bin.cabal.in | 8 | ||||
| -rw-r--r-- | ghc/ghc.mk | 4 |
2 files changed, 6 insertions, 6 deletions
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 |