GHC_PROG=$(odir)/ghc-$(ProjectVersion)
endif
-ifneq "$(stage)" "2"
+ifeq "$(stage)" "1"
HS_PROG = $(GHC_PROG)
endif
@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)
@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."
# 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
+
+ifneq "$(GhcNotThreaded)" "YES"
# Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
SRC_HC_OPTS += -threaded
+endif
ALL_DIRS += ghci
# (On other system, -W isn't a pwd flag at all.)
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+all :: $(odir)/ghc-inplace.bat ghc-inplace.bat
+endif
+
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
# MSys (...and cygwin with a mingw toolchain)
SCRIPT_SHELL = $(shell cd /bin; pwd -W 2>/dev/null || echo "/bin")/sh
else
# Re exec, see note 2 above
chmod 755 $@
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ghc-inplace.bat $(odir)/ghc-inplace.bat: $(GHC_PROG)
+ @$(RM) $@
+ echo '@call $(subst /,\,$(GHC_COMPILER_DIR_ABS)/$(GHC_PROG)) -B$(FPTOOLS_TOP_ABS_PLATFORM) %*' >> $@
+ chmod 755 $@
+endif
+
ghc-inplace : stage1/ghc-inplace
$(RM) -f $@ && $(LN_S) $< $@
#-----------------------------------------------------------------------------
# Building the GHC package
-# The GHC package is made from the stage 2 build. Fortunately the
-# package build system framework more or less does the right thing for
-# us here.
-
-# All this section is stage-2 only!
-ifeq "$(stage)" "2"
+# The GHC package is made from the stage 2 build and later.
+# Fortunately the package build system framework more or less does the
+# right thing for us here.
+ifneq "$(findstring $(stage), 2 3)" ""
PACKAGE = ghc
HIERARCHICAL_LIB = NO
VERSION = $(ProjectVersion)
# 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.
#