Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(842)

Unified Diff: build/toolchain/win/setup_toolchain.py

Issue 2814843003: Specify the SDK version when running vcvarsall.bat (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/win/setup_toolchain.py
diff --git a/build/toolchain/win/setup_toolchain.py b/build/toolchain/win/setup_toolchain.py
index e0fcb2738c6612d6f817f9612148031a499aef21..e8b08495745ce021da2c2e4533b78ead7270db22 100644
--- a/build/toolchain/win/setup_toolchain.py
+++ b/build/toolchain/win/setup_toolchain.py
@@ -139,7 +139,10 @@ def _LoadToolchainEnv(cpu, sdk_dir):
raise Exception('%s is missing - make sure VC++ tools are installed.' %
script_path)
script_path = other_path
- args = [script_path, 'amd64_x86' if cpu == 'x86' else 'amd64']
+ # Chromium requires the 10.0.14393.0 SDK. Previous versions don't have all
+ # of the required declarations, and 10.0.15063.0 is buggy.
+ args = [script_path, 'amd64_x86' if cpu == 'x86' else 'amd64',
+ '10.0.14393.0']
variables = _LoadEnvFromBat(args)
scottmg 2017/04/11 21:23:19 I don't think this works on VS2015, there was no S
brucedawson 2017/04/11 21:40:59 I tested it on VS 2015. It works fine. It also wor
return _ExtractImportantEnvironment(variables)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698