From 2d5b2103b272a6ad9ad183e710ff82835226c18b Mon Sep 17 00:00:00 2001 From: brettw Date: Thu, 6 Aug 2015 16:21:36 -0700 Subject: [PATCH] Add /bigobj to all builds on Windows. This is set in GYP for all compiler invocations. In GN it was only set in one place in content. This brings GN closer to GYP. Review URL: https://codereview.chromium.org/1269253003 Cr-Commit-Position: refs/heads/master@{#342230} --- build/config/compiler/BUILD.gn | 1 + content/common/BUILD.gn | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index ffd30881e311..0424ca519355 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -116,6 +116,7 @@ config("compiler") { "/Gy", # Enable function-level linking. "/GS", # Enable buffer security checking. "/FS", # Preserve previous PDB behavior. + "/bigobj", # Some of our files are bigger than the regular limits. ] # Force C/C++ mode for the given GN detected file type. This is necessary diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index 1683f01d6709..751bf604478f 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -486,11 +486,6 @@ source_set("common") { ] } } - - if (is_win && current_cpu == "x64") { - # TODO(jschuh): Remove this after crbug.com/173851 gets fixed. - cflags = [ "/bigobj" ] - } } mojom("mojo_bindings") { -- 2.11.4.GIT