X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=6c83f9cd8c3a5652881c465efda5dda15cf0e107;hb=308cb59e89a5be1ed6d55da39a843ca5f1828445;hp=8cc97208aad2f52eebb1cbb54555be1033d9d118;hpb=eea8fd53dce9b81a32e1e8c871ef6b3cf57295da;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 8cc9720..6c83f9c 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -217,6 +217,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
 	@echo "cHscIfaceFileVersion  = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
 	@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
 	@echo "cGhcUnregisterised    = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS)
+	@echo "cGhcEnableTablesNextToCode = \"$(GhcEnableTablesNextToCode)\"" >> $(CONFIG_HS)
 	@echo "cLeadingUnderscore    = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS)
 	@echo "cRAWCPP_FLAGS         = \"$(RAWCPP_FLAGS)\"" >> $(CONFIG_HS)
 	@echo "cGCC                  = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS)
@@ -346,10 +347,6 @@ endif
 	@echo "#define HOST_VENDOR \"$(TargetVendor_CPP)\"" >> $@
 	@echo "#define TARGET_VENDOR \"$(TargetVendor_CPP)\"" >> $@
 	@echo >> $@
-ifeq "$(GhcWithTablesNextToCode)" "YES"
-	@echo "#define TABLES_NEXT_TO_CODE 1" >> $@
-endif
-	@echo >> $@
 	@echo "#endif /* __PLATFORM_H__ */"          >> $@
 	@echo "Done."
 
@@ -420,6 +417,12 @@ SRC_HC_OPTS += -DGHCI -package template-haskell
 # SRC_HC_OPTS += -DGHCI -DBREAKPOINT -package template-haskell
 PKG_DEPENDS += template-haskell
 
+# Should GHCI be building info tables in the TABLES_NEXT_TO_CODE style
+# or not?
+ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
+SRC_HC_OPTS += -DGHCI_TABLES_NEXT_TO_CODE
+endif
+
 # Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
 SRC_HC_OPTS += -threaded
 
@@ -855,6 +858,9 @@ HS_IFACES   = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS)))
 # Haddock can't handle recursive modules currently, so we disable it for now.
 NO_HADDOCK_DOCS = YES
 
+# Tell package.mk not to set $(HC)
+NO_SET_HC = YES
+
 # The stage 2 GHC binary itself is built by  compiling main/Main.hs 
 # (the same as used in stage 1) against the GHC package.
 #