diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2006-10-17 09:44:35 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2006-10-17 09:44:35 +0000 |
| commit | 80564ddc183ea98856994112858f0b9f3e178f94 (patch) | |
| tree | b7ec4ba800d4f92fc3bb16fdd4d7049687ded56b /includes/Makefile | |
| parent | f1842cac3b167b4597b4708aaf4a8392834aa06d (diff) | |
| download | haskell-80564ddc183ea98856994112858f0b9f3e178f94.tar.gz | |
Rejig TABLES_NEXT_TO_CODE: the -unreg flag was broken by earlier changes
A GHC binary can generally build either registerised or unregisterised
code, unless it is unregisterised only.
The previous changes broke this, but I think I've now restored it.
Diffstat (limited to 'includes/Makefile')
| -rw-r--r-- | includes/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/includes/Makefile b/includes/Makefile index b1c57f9d01..4e4a82b7a1 100644 --- a/includes/Makefile +++ b/includes/Makefile @@ -11,15 +11,11 @@ H_FILES = $(filter-out gmp.h,$(wildcard *.h)) gmp.h # # Options # -ifeq "$(GhcWithNoRegs)" "YES" -SRC_CC_OPTS += -DNO_REGS +ifeq "$(GhcUnregisterised)" "YES" +SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER endif -ifeq "$(GhcWithMiniInterpreter)" "YES" -SRC_CC_OPTS += -DUSE_MINIINTERPRETER -endif - -ifeq "$(GhcWithTablesNextToCode)" "YES" +ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO" SRC_CC_OPTS += -DTABLES_NEXT_TO_CODE endif |