From: Alan Hourihane <alanh@vmware.com>
Date: Tue, 26 Jan 2010 19:13:27 +0000 (+0000)
Subject: only use -Werror flags with gcc 4.2.x and 4.3.x.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1019f0de1170f627e8e9ce7b449f7a76d89c6742;p=mesa.git

only use -Werror flags with gcc 4.2.x and 4.3.x.
could use a better test here though.
---

diff --git a/scons/gallium.py b/scons/gallium.py
index 24f88e104bd..1a095d89933 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -268,16 +268,22 @@ def generate(env):
         ccflags += [
             '-Wall',
             '-Wmissing-field-initializers',
-            '-Werror=pointer-arith',
             '-Wno-long-long',
             '-ffast-math',
             '-fmessage-length=0', # be nice to Eclipse
         ]
         cflags += [
-            '-Werror=declaration-after-statement',
             '-Wmissing-prototypes',
             '-std=gnu99',
         ]
+        if env['CCVERSION'].startswith('4.2.') or
+           env['CCVERSION'].startswith('4.3.'):
+	    ccflags += [
+            	'-Werror=pointer-arith',
+	    ]
+	    cflags += [
+            	'-Werror=declaration-after-statement',
+	    ]
     if msvc:
         # See also:
         # - http://msdn.microsoft.com/en-us/library/19z1t1wy.aspx