From dd04583dcbd25870c7b7c06303a3f69dc0e342d1 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 12 Jun 2019 12:00:50 +0200 Subject: [PATCH] macOS: Don't disable custom libc++ for cef_sandbox build (see issue #2677) --- tools/gn_args.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/gn_args.py b/tools/gn_args.py index e5f0c0cde..b1a06e0e9 100644 --- a/tools/gn_args.py +++ b/tools/gn_args.py @@ -441,15 +441,16 @@ def GetConfigArgsSandbox(platform, args, is_debug, cpu): # Avoid /LTCG linker warnings and generate smaller lib files. 'is_official_build': False, - - # Avoid Debug build linker errors caused by custom libc++. - 'use_custom_libcxx': False, } if is_debug: # Enable iterator debugging (_ITERATOR_DEBUG_LEVEL=2). add_args['enable_iterator_debugging'] = True + if platform == 'windows': + # Avoid Debug build linker errors caused by custom libc++. + add_args['use_custom_libcxx'] = False + result = MergeDicts(args, add_args, { 'is_debug': is_debug, 'target_cpu': cpu,