From 7fcb2532b99ddf65d78dd02ea06ce8a1a6229949 Mon Sep 17 00:00:00 2001
From: Björn Jacke <bj@sernet.de>
Date: Tue, 30 Oct 2012 11:48:25 +0100
Subject: wafbuild: reorder the Werror checks so that the ambigous w2 option is
 being checked last

---
 lib/replace/wscript | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/replace')

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 8d97f5b234..9a6be208de 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -54,7 +54,11 @@ struct foo bar = { .y = 'X', .x = 1 };
             break
 
     # Try to find the right extra flags for -Werror behaviour
-    for f in ["-Werror", "-w2", "-errwarn=%all", "-qhalt=w"]:
+    for f in ["-Werror",       # GCC
+	      "-errwarn=%all", # Sun Studio
+	      "-qhalt=w",     # IBM xlc
+	      "-w2",           # Tru64
+	      ]:
         if conf.CHECK_CFLAGS([f], '''
 '''):
             if not 'WERROR_CFLAGS' in conf.env:
-- 
cgit