From: wolfgang <unknown>
Date: Wed, 15 Sep 2004 02:47:03 +0000 (+0000)
Subject: [project @ 2004-09-15 02:47:03 by wolfgang]
X-Git-Tag: Initial_conversion_from_CVS_complete~1599
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=f19e3063d8c376255bc2749af2f31d35308d8da8

[project @ 2004-09-15 02:47:03 by wolfgang]
Accept '#pragma' lines in the cmm parser.
This is necessary because Apple's version of GNU cpp 3.3 leaves #pragma
lines in it's output, which cause the build to fail on Mac OS X with
GCC >= 3.3
---

diff --git a/ghc/compiler/cmm/CmmLex.x b/ghc/compiler/cmm/CmmLex.x
index e1be71a..ff98508 100644
--- a/ghc/compiler/cmm/CmmLex.x
+++ b/ghc/compiler/cmm/CmmLex.x
@@ -61,6 +61,7 @@ $namechar  = [$namebegin $digit]
 cmm :-
 
 $white_no_nl+		;
+^\# pragma .* \n        ; -- Apple GCC 3.3 CPP generates pragmas in its output
 
 ^\# (line)? 		{ begin line_prag }