From de46befc1821ebe65e332cc28bebda2c4c792f87 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 11 Jun 2021 11:52:44 -0400 Subject: [PATCH] Windows: Forbid non-component Debug builds (see issue #2679) --- tools/gn_args.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/gn_args.py b/tools/gn_args.py index bc5a915eb..8a960d0a8 100644 --- a/tools/gn_args.py +++ b/tools/gn_args.py @@ -207,9 +207,6 @@ def GetRecommendedDefaultArgs(): # distribution. 'is_component_build': False, - # Don't enforce component builds in debug mode. - 'forbid_non_component_debug_builds': False, - # Specify the current PGO phase. Default is 0 (turned off) for normal # builds and 2 (used during the optimization phase) for official Windows # and macOS builds. Currently turned off for CEF because it requires @@ -228,6 +225,12 @@ def GetRecommendedDefaultArgs(): 'enable_resource_allowlist_generation': False, } + if platform != 'windows': + # Only allow non-component Debug builds on non-Windows platforms. These + # builds will fail on Windows due to linker issues (running out of memory, + # etc). See https://bitbucket.org/chromiumembedded/cef/issues/2679. + result['forbid_non_component_debug_builds'] = False + if platform == 'linux': # Use a sysroot environment. Default is true. False is recommended for local # builds.