From 2ab6e9abac4f3d7f49f51ec2c674f25e34c0cfd4 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 10 Jun 2014 17:02:38 +0000 Subject: [PATCH] Set DEPOT_TOOLS_WIN_TOOLCHAIN=0 by default (issue #1304). git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1916@1732 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- tools/gclient_hook.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/gclient_hook.py b/tools/gclient_hook.py index 9b802e14e..e62300ec6 100644 --- a/tools/gclient_hook.py +++ b/tools/gclient_hook.py @@ -22,11 +22,18 @@ gyper = [ 'python', 'tools/make_version_header.py', RunAction(cef_dir, gyper) print "\nPatching build configuration and source files for CEF..." -patcher = [ 'python', 'tools/patcher.py', - '--patch-config', 'patch/patch.cfg' ]; +patcher = [ 'python', 'tools/patcher.py', + '--patch-config', 'patch/patch.cfg' ] RunAction(cef_dir, patcher) print "\nGenerating CEF project files..." -os.environ['CEF_DIRECTORY'] = os.path.basename(cef_dir); + +# depot_tools currently bundles VS2013 Express Update 1 which causes linker +# errors with Debug builds (see issue #1304). Don't use the bundled version +# unless explicitly requested. +if not 'DEPOT_TOOLS_WIN_TOOLCHAIN' in os.environ.keys(): + os.environ['DEPOT_TOOLS_WIN_TOOLCHAIN'] = '0' + +os.environ['CEF_DIRECTORY'] = os.path.basename(cef_dir) gyper = [ 'python', '../build/gyp_chromium', 'cef.gyp', '-I', 'cef.gypi' ] RunAction(cef_dir, gyper)