| Index: build/config/compiler/BUILD.gn
|
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
| index 481b004c6d1ac308a2a693d8f46523c42d352a79..e3b9c45e7966a084f0bb89271f62483986b43d6d 100644
|
| --- a/build/config/compiler/BUILD.gn
|
| +++ b/build/config/compiler/BUILD.gn
|
| @@ -1007,17 +1007,14 @@ config("default_warnings") {
|
| "-Wno-inconsistent-missing-override",
|
| ]
|
|
|
| - # NaCl's Clang compiler and Chrome's hermetic Clang compiler will almost
|
| - # always have different versions. Certain flags may not be recognized by
|
| - # one version or the other.
|
| + # 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",
|
| -
|
| - # TODO(thakis): https://crbug.com/604888
|
| - "-Wno-undefined-var-template",
|
| ]
|
|
|
| if (llvm_force_head_revision) {
|
| @@ -1027,6 +1024,14 @@ config("default_warnings") {
|
| ]
|
| }
|
| }
|
| + if (!is_nacl && !use_xcode_clang) {
|
| + # Flags NaCl (Clang 3.7) and Xcode 7.3 (Clang clang-703.0.31) do not
|
| + # recognize.
|
| + cflags += [
|
| + # TODO(thakis): https://crbug.com/604888
|
| + "-Wno-undefined-var-template",
|
| + ]
|
| + }
|
| }
|
| }
|
|
|
|
|