From faabbc9b1cbdd1f879caaaf333310dbfc65c8c9e Mon Sep 17 00:00:00 2001
From: "evan@chromium.org"
 <evan@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>
Date: Wed, 25 Jan 2012 18:32:31 +0000
Subject: [PATCH] linux: don't make -Werror setting conditional on OS

People who need to adjust this should adjust it directly.
Guessing just makes everything more confusing.


Review URL: http://codereview.chromium.org/9288008

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119092 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
---
 common.gypi | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/common.gypi b/common.gypi
index 4f6513c72..a4deacae8 100644
--- a/common.gypi
+++ b/common.gypi
@@ -1664,13 +1664,7 @@
         # Enable -Werror by default, but put it in a variable so it can
         # be disabled in ~/.gyp/include.gypi on the valgrind builders.
         'variables': {
-          'conditions': [
-            ['OS=="linux"', {
-              'werror%': '-Werror',
-              }, { # turn off -Werror on other Unices
-              'werror%': '',
-            }],
-          ],
+          'werror%': '-Werror',
         },
         'defines': [
           '_FILE_OFFSET_BITS=64',