Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(915)

Unified Diff: build/config/BUILD.gn

Issue 1261953002: Re-enable precompiled headers in GN on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more flags Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/BUILD.gn
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
index 4a33fbba44b0bb34a8d5685b75bd085b0faf0bdb..2d1dd1ed7d4dbcf0184722fe87f9de3928d087c3 100644
--- a/build/config/BUILD.gn
+++ b/build/config/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/features.gni")
import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/ui.gni")
import("//build/module_args/v8.gni")
+import("//build/toolchain/goma.gni")
declare_args() {
# When set, turns off the (normally-on) iterator debugging and related stuff
@@ -418,10 +419,7 @@ config("default_libs") {
#
# Recommend precompiled headers for targets with more than 50 .cc files.
config("precompiled_headers") {
- # TODO(brettw) enable this when everything is working. A previous attempt
- # to enable this caused some bot redness which needs ot be investigated.
- #if (is_win) {
- if (false) {
+ if (is_win && !is_official_build && !use_goma) {
# This is a string rather than a file GN knows about. It has to match
# exactly what's in the /FI flag below, and what might appear in the source
# code in quotes for an #include directive.
@@ -434,5 +432,16 @@ config("precompiled_headers") {
# Force include the header.
cflags = [ "/FI$precompiled_header" ]
+
+ # Disable warning for "this file was empty after preprocessing". This
+ # error is generated only in C mode for ANSI compatibility. It conflicts
+ # with precompiled headers since the source file that's "compiled" for
+ # making the precompiled header is empty.
+ #
+ # This error doesn't happen every time. In VS2013, it seems if the .pch
+ # file doesn't exist, no error will be generated (probably MS tested this
+ # case but forgot the other one?). To reproduce this error, do a build,
+ # then delete the precompile.c.obj file, then build again.
+ cflags_c = [ "/wd4206" ]
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698