X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=18540d707876a75aff672c1bf3b253fbd963c3bd;hb=1c3d4480c8751665e71e344b71a844ca4191acc5;hp=d0c68ab1d655ff0aa1542962798a9a986bf6c995;hpb=c5b41b6ee21f73ef706cd14eef2b6d6809099f9d;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index d0c68ab..18540d7 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -27,6 +27,7 @@ ifeq "$(GhcThreaded)$(GhcProfiled)" "YESYES"
 $(error Cannot make GHC both threaded and profiled)
 endif
 
+
 #-----------------------------------------------------------------------------
 # Counting source code lines
 
@@ -89,6 +90,16 @@ ifeq "$(stage)" ""
 stage=1
 endif
 
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+ifeq "$(stage)" "1"
+DQ = \"
+else
+DQ = \\\"
+endif
+else
+DQ = \"
+endif
+
 .DUMMY: stage_dir
 stage_dirs :
 	$(MKDIRHIER) stage$(stage)
@@ -215,6 +226,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
 	@echo "cBooterVersion        = \"$(GhcVersion)\"" >> $(CONFIG_HS)
 	@echo "cStage                = STAGE" >> $(CONFIG_HS)
 	@echo "cHscIfaceFileVersion  = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
+	@echo "cSplitObjs            = \"$(SplitObjs)\"" >> $(CONFIG_HS)
 	@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
 	@echo "cGhcUnregisterised    = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS)
 	@echo "cGhcEnableTablesNextToCode = \"$(GhcEnableTablesNextToCode)\"" >> $(CONFIG_HS)
@@ -719,10 +731,14 @@ EXCLUDED_C_SRCS += ghc-inplace.c
 # will go wrong when we use it in a Haskell string below.
 TOP_ABS=$(subst \\,/,$(FPTOOLS_TOP_ABS_PLATFORM))
 
-GHC_PATH=$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)
+GHC_PATH=$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)$(exeext)
+
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+INPLACE_EXTRA_FLAGS = -optc-DWINDOWS
+endif
 
 $(INPLACE_PROG): ghc-inplace.c
-	$(HC) -cpp -optc-DGHC_PATH=\"$(GHC_PATH)\" -optc-DTOP_ABS=\"$(TOP_ABS)\" $< -o $@
+	$(HC) -cpp -optc-DGHC_PATH=$(DQ)$(GHC_PATH)$(DQ) -optc-DTOP_ABS=$(DQ)$(TOP_ABS)$(DQ) $(INPLACE_EXTRA_FLAGS) $< -o $@
 
 all :: $(INPLACE_PROG)
 
@@ -910,7 +926,7 @@ all :: $(GHC_PROG)
 endif
 endif
 
-$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"'
+$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE=$(DQ)$(stage)$(DQ)
 
 #-----------------------------------------------------------------------------
 # binary-dist