summaryrefslogtreecommitdiff
path: root/compiler/ghc.mk
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2019-01-20 19:25:26 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-08-10 14:39:27 -0400
commit818602818bb8553b241271204d159d5a40971d5a (patch)
tree135e9d4f7d635b94effe709efc8e3f20cc6968f6 /compiler/ghc.mk
parent83ca42de519cdfa28b38164e90d726034dba768e (diff)
downloadhaskell-818602818bb8553b241271204d159d5a40971d5a.tar.gz
Consolidate `TablesNextToCode` and `GhcUnreigsterised` in configure (#15548)
`TablesNextToCode` is now a substituted by configure, where it has the correct defaults and error handling. Nowhere else needs to duplicate that, though we may want the compiler to to guard against bogus settings files. I renamed it from `GhcEnableTablesNextToCode` to `TablesNextToCode` to: - Help me guard against any unfixed usages - Remove any lingering connotation that this flag needs to be combined with `GhcUnreigsterised`. Original reviewers: Original subscribers: TerrorJack, rwbarton, carter Original Differential Revision: https://phabricator.haskell.org/D5082
Diffstat (limited to 'compiler/ghc.mk')
-rw-r--r--compiler/ghc.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 629a1ed560..441b698972 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -256,7 +256,7 @@ endif
ifeq "$(GhcWithInterpreter)" "YES"
compiler_stage2_CONFIGURE_OPTS += --flags=ghci
-ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
+ifeq "$(TablesNextToCode)" "YES"
# Should GHCI be building info tables in the TABLES_NEXT_TO_CODE style
# or not?
# XXX This should logically be a CPP option, but there doesn't seem to