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

Unified Diff: build/config/compiler/BUILD.gn

Issue 2215433002: Rework default GN symbol handling for win goma builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix long string literal Created 4 years, 4 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 | build/config/compiler/compiler.gni » ('j') | build/config/compiler/compiler.gni » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/compiler/BUILD.gn
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 79723f6cc76c041697955f5c7de91e2935e78aa5..984a4e3b63e6de45bc9de24f498c9f0e531a632c 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1484,14 +1484,8 @@ config("default_optimization") {
config("symbols") {
if (is_win) {
import("//build/toolchain/goma.gni")
- if (use_goma) {
- # Disable symbols during goma compilation because otherwise the redundant
- # debug information (repeated in every .obj file) makes linker memory
- # consumption and link times unsustainable (crbug.com/630074).
- cflags = []
- } else {
- cflags = [ "/Zi" ] # Produce PDB file, no edit and continue.
- }
+ cflags = [ "/Zi" ] # Produce PDB file, no edit and continue.
+
if (is_win_fastlink && visual_studio_version != "2013") {
# Tell VS 2015+ to create a PDB that references debug
# information in .obj and .lib files instead of copying
@@ -1560,6 +1554,11 @@ config("default_symbols") {
} else if (symbol_level == 1) {
configs = [ ":minimal_symbols" ]
} else if (symbol_level == 2) {
+ assert(
+ !(is_win && use_goma),
Reid Kleckner 2016/08/13 01:55:27 I'd like it if you tossed in '&& !is_clang' so tha
Dirk Pranke 2016/08/14 23:34:58 Okay, will do. At the moment, I'm actually leanin
+ "Cannot generate full symbols on windows with goma, use " +
+ "symbol_level=1 or compile locally without goma, which will be " +
+ "faster anyway.")
configs = [ ":symbols" ]
} else {
assert(false)
« no previous file with comments | « no previous file | build/config/compiler/compiler.gni » ('j') | build/config/compiler/compiler.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698