X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=18540d707876a75aff672c1bf3b253fbd963c3bd;hb=fc395f40b0cc45be084027b38d3e28c2f498227d;hp=5ca2c2dbb253ae0de5e0c5f30adcfa9e340bb9f9;hpb=aacbb9918d5458df0a64231bb55976679e471b91;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 5ca2c2d..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)
@@ -204,7 +215,7 @@ endif
 CONFIG_HS 	= main/Config.hs
 boot :: $(CONFIG_HS)
 
-$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
+$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
 	@$(RM) -f $(CONFIG_HS)
 	@echo "Creating $(CONFIG_HS) ... "
 	@echo "module Config where" >>$(CONFIG_HS)
@@ -215,6 +226,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
 	@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)
@@ -261,7 +273,7 @@ CLEAN_FILES += $(CONFIG_HS)
 
 PLATFORM_H = ghc_boot_platform.h
 
-stage1/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk Makefile
+stage1/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk
 	@echo "Creating $@..."
 	@$(RM) $@
 	@echo "#ifndef __PLATFORM_H__"  >$@
@@ -307,7 +319,7 @@ endif
 # For stage2 and above, the BUILD platform is the HOST of stage1, and
 # the HOST platform is the TARGET of stage1.  The TARGET remains the same
 # (stage1 is the cross-compiler, not stage2).
-stage2/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk Makefile
+stage2/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk
 	@echo "Creating $@..."
 	@$(RM) $@
 	@echo "#ifndef __PLATFORM_H__"  >$@
@@ -433,6 +445,9 @@ endif
 ifeq "$(GhcProfiled)" "YES"
 SRC_LD_OPTS += -prof
 endif
+ifeq "$(GhcDebugged)" "YES"
+SRC_LD_OPTS += -debug
+endif
 
 ALL_DIRS += ghci
 
@@ -709,32 +724,25 @@ SRC_LD_OPTS += -no-link-chk
 # See comments in $(FPTOOLS_TOP)/utils/ghc-pkg/Makefile for why we use
 # a real binary here rather than a shell script.
 
-INPLACE_HS   = $(odir)/ghc-inplace.hs
 INPLACE_PROG = $(odir)/ghc-inplace$(exeext)
-EXCLUDED_SRCS += $(INPLACE_HS)
+EXCLUDED_C_SRCS += ghc-inplace.c
 
 # FPTOOLS_TOP_ABS platform uses backslashes, at least on Cygwin, but that
 # will go wrong when we use it in a Haskell string below.
 TOP_ABS=$(subst \\,/,$(FPTOOLS_TOP_ABS_PLATFORM))
 
-ifeq "$(stage)" "1"
-EnvImport = System.Environment
-GetArgs = getArgs
-else
-EnvImport = GHC.Environment
-GetArgs = getFullArgs
-endif
+GHC_PATH=$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)$(exeext)
 
-$(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk
-	echo "import System.Cmd; import $(EnvImport); import System.Exit" > $@
-	echo "main = do args <- $(GetArgs); rawSystem \"$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)\" (\"-B$(TOP_ABS)\":\"-fhardwire-lib-paths\":args) >>= exitWith" >> $@
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+INPLACE_EXTRA_FLAGS = -optc-DWINDOWS
+endif
 
-$(INPLACE_PROG): $(INPLACE_HS)
-	$(HC) --make $< -o $@
+$(INPLACE_PROG): ghc-inplace.c
+	$(HC) -cpp -optc-DGHC_PATH=$(DQ)$(GHC_PATH)$(DQ) -optc-DTOP_ABS=$(DQ)$(TOP_ABS)$(DQ) $(INPLACE_EXTRA_FLAGS) $< -o $@
 
 all :: $(INPLACE_PROG)
 
-CLEAN_FILES += $(INPLACE_HS) $(INPLACE_PROG)
+CLEAN_FILES += $(INPLACE_PROG)
 
 ifeq "$(stage)" "1"
 ghc-inplace : $(INPLACE_PROG)
@@ -918,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
@@ -1015,4 +1023,10 @@ endif
 # -optdep--exclude-module flag in GHC 6.4.  It is not required for any
 # other version of GHC, but doesn't do any harm.
 
+ifeq "$(MakefileDeps)" "YES"
+$(CONFIG_HS) : Makefile
+stage1/$(PLATFORM_H) : Makefile
+stage2/$(PLATFORM_H) : Makefile
+endif
+
 -include .depend-$(stage)