bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Marshall Greenblatt 2014-06-10 17:02:38 +00:00
parent 331c6ed5a8
commit 2ab6e9abac
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/gclient_hook.py
View File

@ -22,11 +22,18 @@ gyper = [ 'python', 'tools/make_version_header.py',
RunAction(cef_dir, gyper) RunAction(cef_dir, gyper)
print "\nPatching build configuration and source files for CEF..." print "\nPatching build configuration and source files for CEF..."
patcher = [ 'python', 'tools/patcher.py', patcher = [ 'python', 'tools/patcher.py',
'--patch-config', 'patch/patch.cfg' ]; '--patch-config', 'patch/patch.cfg' ]
RunAction(cef_dir, patcher) RunAction(cef_dir, patcher)
print "\nGenerating CEF project files..." 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' ] gyper = [ 'python', '../build/gyp_chromium', 'cef.gyp', '-I', 'cef.gypi' ]
RunAction(cef_dir, gyper) RunAction(cef_dir, gyper)