Index: build/config/compiler/BUILD.gn |
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
index 83d649b4c44ad5724d446fae9df91943c2e4422c..a065d39ec245c230863d58dd2ab704494592424b 100644 |
--- a/build/config/compiler/BUILD.gn |
+++ b/build/config/compiler/BUILD.gn |
@@ -1044,6 +1044,11 @@ config("default_warnings") { |
# TODO(thakis): Remove, http://crbug.com/263960 |
if (is_clang) { |
cflags_cc += [ "-Wno-reserved-user-defined-literal" ] |
+ |
+ # TODO(thakis): Enable this, crbug.com/507717 |
+ if (!is_nacl) { |
+ cflags += [ "-Wno-shift-negative-value" ] |
+ } |
} else { |
cflags_cc += [ "-Wno-literal-suffix" ] |
} |
@@ -1078,17 +1083,6 @@ config("default_warnings") { |
"-Wno-inconsistent-missing-override", |
] |
- # Chrome's hermetic Clang compiler, NaCl's Clang compiler and Xcode's Clang |
- # compiler will almost always have different versions. Certain flags may not |
- # be recognized by one version or the other. |
- if (!is_nacl) { |
- # Flags NaCl (Clang 3.7) does not recognize. |
- cflags += [ |
- # TODO(thakis): Enable this, crbug.com/507717 |
- "-Wno-shift-negative-value", |
- ] |
- } |
- |
# use_xcode_clang only refers to the iOS toolchain, host binaries use |
# chromium's clang always. |
if (!is_nacl && (!use_xcode_clang || current_toolchain == host_toolchain)) { |