X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FMakefile;h=aac594d3e9778cbad026766bb6d3ed248c4118b2;hp=60c70fd9a93d0a67ecf2131e121f641039b48cbd;hb=84923cc7de2a93c22a2f72daf9ac863959efae13;hpb=b4af1a0ff3d43e70e54629e89ffff62d49de1746

diff --git a/compiler/Makefile b/compiler/Makefile
index 60c70fd..aac594d 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -192,7 +192,7 @@ else
 GHC_PROG=$(odir)/ghc-$(ProjectVersion)
 endif
 
-ifneq "$(stage)" "2"
+ifeq "$(stage)" "1"
 HS_PROG = $(GHC_PROG)
 endif
 
@@ -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)
@@ -412,12 +413,22 @@ ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
 
 # Yes, include the interepreter, readline, and Template Haskell extensions
 SRC_HC_OPTS += -DGHCI -package template-haskell
-# -DBREAKPOINT causes a loop in stage2
-# SRC_HC_OPTS += -DGHCI -DBREAKPOINT -package template-haskell
 PKG_DEPENDS += template-haskell
 
+# Should the debugger commands be enabled?
+ifeq "$(GhciWithDebugger)" "YES"
+SRC_HC_OPTS += -DDEBUGGER
+endif
+# 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
 
@@ -719,8 +730,12 @@ all :: $(odir)/ghc-inplace ghc-inplace
 #   (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
+SCRIPT_SHELL = $(shell cd /bin; pwd -W 2>/dev/null || echo "/bin")/sh
 else
 #	Cygwin and Unix
 SCRIPT_SHELL = /bin/sh
@@ -747,6 +762,13 @@ $(odir)/ghc-inplace : $(GHC_PROG)
 # 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) $< $@
 
@@ -818,18 +840,17 @@ coreSyn/CorePrep_HC_OPTS += -auto-all
 #-----------------------------------------------------------------------------
 # 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)
 PKG_DEPENDS += base haskell98
 PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(PKG_DEPENDS)'
+PACKAGE_CPP_OPTS += -DSTAGE='"$(stage)"'
 
 # Omit Main from the library, the client will want to plug their own Main in
 LIBOBJS = $(filter-out $(odir)/main/Main.o $(odir)/parser/hschooks.o, $(OBJS))
@@ -852,6 +873,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.
 #
@@ -861,7 +885,16 @@ NO_HADDOCK_DOCS = YES
 
 all :: $(GHC_PROG)
 
+# The stage 2 and stage 3 package.conf.in files are different, because they
+# point to either the stage2/ or stage3/ dirs in import-dirs.  Hence before
+# linking the ghc binary we must install the correct version of the package
+# configuration.  Yeuch... maybe one day this will all be done more cleanly.
+STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE)
+
 $(GHC_PROG) : libHS$(PACKAGE)$(_way).a main/Main.hs
+	$(RM) package.conf.inplace
+	$(RM) $(STAMP_PKG_CONF)
+	$(MAKE) $(STAMP_PKG_CONF)
 	$(MAKE) -f Makefile.ghcbin $(MFLAGS) HS_PROG=$(GHC_PROG) $@
 
 # Propagate standard targets to Makefile.ghcbin