diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2019-01-20 19:25:26 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-08-10 14:39:27 -0400 |
| commit | 818602818bb8553b241271204d159d5a40971d5a (patch) | |
| tree | 135e9d4f7d635b94effe709efc8e3f20cc6968f6 /includes/ghc.mk | |
| parent | 83ca42de519cdfa28b38164e90d726034dba768e (diff) | |
| download | haskell-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 'includes/ghc.mk')
| -rw-r--r-- | includes/ghc.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/ghc.mk b/includes/ghc.mk index 7ad63ba8ef..ad51234143 100644 --- a/includes/ghc.mk +++ b/includes/ghc.mk @@ -102,7 +102,7 @@ $(includes_H_CONFIG) : mk/config.h mk/config.mk includes/ghc.mk | $$(dir $$@)/. # # Tack on some extra config information from the build system # -ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO" +ifeq "$(TablesNextToCode)" "YES" @echo >> $@ @echo "#define TABLES_NEXT_TO_CODE 1" >> $@ endif @@ -211,7 +211,7 @@ $(includes_SETTINGS) : includes/Makefile | $$(dir $$@)/. @echo ',("Use native code generator", "$(GhcWithNativeCodeGen)")' >> $@ @echo ',("Support SMP", "$(GhcWithSMP)")' >> $@ @echo ',("RTS ways", "$(GhcRTSWays)")' >> $@ - @echo ',("Tables next to code", "$(GhcEnableTablesNextToCode)")' >> $@ + @echo ',("Tables next to code", "$(TablesNextToCode)")' >> $@ @echo ',("Leading underscore", "$(LeadingUnderscore)")' >> $@ @echo ',("Use LibFFI", "$(UseLibFFIForAdjustors)")' >> $@ # Note that GhcThreaded just reflects the Makefile variable setting. In |