From: Ian Lynagh <igloo@earth.li>
Date: Wed, 23 Jan 2008 17:39:33 +0000 (+0000)
Subject: Windows now doesn't need different values for DQ in the build system
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=1f9d5a8835940fa332f2b1b51ff59e0239b5fc3a

Windows now doesn't need different values for DQ in the build system
---

diff --git a/compiler/Makefile b/compiler/Makefile
index 7fb6eea..a7d8452 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -95,15 +95,8 @@ ifeq "$(stage)" ""
 stage=1
 endif
 
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-ifeq "$(stage)" "1"
+# XXX DQ is now the same on all platforms, so get rid of it
 DQ = \"
-else
-DQ = \\\"
-endif
-else
-DQ = \"
-endif
 
 .DUMMY: stage_dir
 stage_dirs :
diff --git a/rts/Makefile b/rts/Makefile
index 9e30a22..db1c31e 100644
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -177,13 +177,8 @@ LIB_LD_OPTS = -L$(shell $(GHC_PKG_INPLACE) field base library-dirs | sed -e 's/l
 endif
 endif
 
-ifeq "$(Windows)" "YES"
-# On Windows GHC does its own commandline parsing, so we need extra
-# doublequote protection. Sigh.
-DQ = \\\"
-else
+# XXX DQ is now the same on all platforms, so get rid of it
 DQ = \"
-endif
 
 # If Main.c is built with optimisation then the SEH exception stuff on
 # Windows gets confused.