From be9ccee64bef5ce6eaff1a1bf5acd56d3a38e56e Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Mon, 20 Aug 2007 23:52:21 +0000 Subject: [PATCH] Fix quoting of double quotes in the Makefile on Windows --- compiler/Makefile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/compiler/Makefile b/compiler/Makefile index 3f443ac..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) @@ -727,7 +738,7 @@ INPLACE_EXTRA_FLAGS = -optc-DWINDOWS endif $(INPLACE_PROG): ghc-inplace.c - $(HC) -cpp -optc-DGHC_PATH=\"$(GHC_PATH)\" -optc-DTOP_ABS=\"$(TOP_ABS)\" $(INPLACE_EXTRA_FLAGS) $< -o $@ + $(HC) -cpp -optc-DGHC_PATH=$(DQ)$(GHC_PATH)$(DQ) -optc-DTOP_ABS=$(DQ)$(TOP_ABS)$(DQ) $(INPLACE_EXTRA_FLAGS) $< -o $@ all :: $(INPLACE_PROG) @@ -915,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 -- 1.7.10.4