From: rrt <unknown>
Date: Tue, 26 Jun 2001 16:32:03 +0000 (+0000)
Subject: [project @ 2001-06-26 16:32:03 by rrt]
X-Git-Tag: Approximately_9120_patches~1712
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=80b915843fe4a34ccc4107e3cf2262fd55ba5d36;hp=de27420cb4fd03e84824a5bc0eca13d76e6cf00e;p=ghc-hetmet.git

[project @ 2001-06-26 16:32:03 by rrt]
Get rid of quotes around arguments to -D and -U. These get stripped by the
Unix shell, but not by Windows's system, which upsets gcc.
---

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index 739e760..0f8e551 100644
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -#include "hschooks.h" #-}
 
 -----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.59 2001/06/15 08:29:58 simonpj Exp $
+-- $Id: DriverFlags.hs,v 1.60 2001/06/26 16:32:03 rrt Exp $
 --
 -- Driver flags
 --
@@ -302,8 +302,13 @@ dynamic_flags = [
   ,  ( "opta",		HasArg (addOpt_a) )
 
 	------ HsCpp opts ---------------------------------------------------
-  ,  ( "D",		Prefix (\s -> addOpt_P ("-D'"++s++"'") ) )
-  ,  ( "U",		Prefix (\s -> addOpt_P ("-U'"++s++"'") ) )
+	-- These options used to put ticks around their arguments for unknown
+	-- reasons. These quotes are stripped by the shell executing system()
+	-- on Unix, but not on Windows, where it therefore goes on to disturb
+	-- gcc. Hence they are now gone; if they need to be replaced later on
+	-- Unix, there will need to be #ifdefery.
+  ,  ( "D",		Prefix (\s -> addOpt_P ("-D"++s) ) )
+  ,  ( "U",		Prefix (\s -> addOpt_P ("-U"++s) ) )
 
 	------ Debugging ----------------------------------------------------
   ,  ( "dstg-stats",	NoArg (writeIORef v_StgStats True) )