Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index 86e68ef1d81c9e181e817338b6b2b09fa38eb340..7db8ab5501d6c4e1d5bc018e9440417d98b5babd 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -100,6 +100,11 @@ |
| # variables sub-dict above, unless overridden. |
| 'branding%': '<(branding)', |
| 'buildtype%': '<(buildtype)', |
| + |
| + # Enable -Werror by default, but put it in a variable so it can |
| + # be disabled (e.g. in ~/.gyp/include.gypi). |
| + 'werror%': '-Werror', |
| + |
|
Sam Clegg
2012/11/15 19:21:05
Moving werror out of linux only block as it is now
|
| # Compute the architecture that we're building for. Default to the |
| # architecture that we're building on. |
| 'conditions': [ |
| @@ -270,9 +275,9 @@ |
| 'conditions': [ |
| ['OS=="linux"', { |
| 'target_defaults': { |
| - # Enable -Werror by default, but put it in a variable so it can |
| - # be disabled in ~/.gyp/include.gypi on the valgrind builders. |
| 'variables': { |
| + # Enable -Werror by default, but put it in a variable so it can |
| + # be disabled (e.g. in ~/.gyp/include.gypi). |
| 'werror%': '-Werror', |
| }, |
| 'cflags': [ |