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:
parent
331c6ed5a8
commit
2ab6e9abac
|
@ -23,10 +23,17 @@ 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)
|
||||||
|
|
Loading…
Reference in New Issue