Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index c2cc6d498a12dae04fab351e6540b264708aa84e..d6b607114f2d6ffbd457ad776f914717c8dabe1a 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1660,8 +1660,6 @@ |
# Enable -Werror by default, but put it in a variable so it can |
# be disabled in ~/.gyp/include.gypi on the valgrind builders. |
'variables': { |
- # Use -fno-strict-aliasing, see http://crbug.com/32204 |
- 'no_strict_aliasing%': 1, |
'conditions': [ |
['OS=="linux"', { |
'werror%': '-Werror', |
@@ -1674,6 +1672,7 @@ |
'<(werror)', # See note above about the werror variable. |
'-pthread', |
'-fno-exceptions', |
+ '-fno-strict-aliasing', # See http://crbug.com/32204 |
'-Wall', |
# TODO(evan): turn this back on once all the builds work. |
# '-Wextra', |
@@ -2047,11 +2046,6 @@ |
'ADDRESS_SANITIZER', |
], |
}], |
- ['no_strict_aliasing==1', { |
- 'cflags': [ |
- '-fno-strict-aliasing', |
- ], |
- }], |
['linux_breakpad==1', { |
'cflags': [ '-g' ], |
'defines': ['USE_LINUX_BREAKPAD'], |