Index: build/config/compiler/BUILD.gn |
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
index 0145175ae39a66ba6de1c9ee7f6a99def10aabac..c89b09a0e462d1256ba5ff2d968f2f7f04ed3393 100644 |
--- a/build/config/compiler/BUILD.gn |
+++ b/build/config/compiler/BUILD.gn |
@@ -157,7 +157,7 @@ config("compiler") { |
] |
} |
- if (is_clang && !is_win) { |
+ if (is_clang && !is_win && !is_nacl) { |
# This is here so that all files get recompiled after a clang roll and |
# when turning clang on or off. (defines are passed via the command line, |
# and build system rebuild things when their commandline changes). Nothing |
@@ -726,6 +726,7 @@ config("default_warnings") { |
if (is_win) { |
cflags = [ |
"/WX", # Treat warnings as errors. |
+ |
# Warnings permanently disabled: |
# TODO(GYP) The GYP build doesn't have this globally enabled but disabled |
@@ -780,6 +781,7 @@ config("default_warnings") { |
# have to turn off this warning (and be careful about how object |
# destruction happens in such cases). |
"/wd4611", |
+ |
# Warnings to evaluate and possibly fix/reenable later: |
"/wd4100", # Unreferenced formal function parameter. |