X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=0095419c4bcb44c59fad19ca2e5431a04b49a89d;hb=a1706e166ef400bab3b15a8fd80145ede6655c62;hp=221c6033520bf3d2445122eaf841e530afe5f077;hpb=ef0180eab8bd60ee98048979c0545c158ec6d534;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 221c603..0095419 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -95,9 +95,6 @@ ifeq "$(stage)" ""
 stage=1
 endif
 
-# XXX DQ is now the same on all platforms, so get rid of it
-DQ = \"
-
 .DUMMY: stage_dir
 stage_dirs :
 	$(MKDIRHIER) stage$(stage)
@@ -219,7 +216,6 @@ boot :: $(CONFIG_HS)
 $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
 	@$(RM) -f $(CONFIG_HS)
 	@echo "Creating $(CONFIG_HS) ... "
-	@echo "{-# OPTIONS -w #-}" >>$(CONFIG_HS)
 	@echo "module Config where" >>$(CONFIG_HS)
 	@echo "cProjectName          :: String" >> $(CONFIG_HS)
 	@echo "cProjectName          = \"$(ProjectName)\"" >> $(CONFIG_HS)
@@ -986,7 +982,7 @@ ifeq "$(BUILD_GHC_PACKAGE)" "YES"
 all :: $(GHC_PROG)
 endif
 
-$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE=$(DQ)$(stage)$(DQ)
+$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"'
 
 ifneq "$(findstring $(stage), 2 3)" ""
 $(warning LIBRARY is $(LIBRARY))