bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Explicitly specify the SDK version in setup_toolchain.py

Browse Source 
Avoid building with a new and untested SDK version. See
https://crbug.com/1089996 for background.
This commit is contained in:
Marshall Greenblatt
2020-07-13 16:23:39 -04:00
parent c551bc2695
commit 1812f94ebd
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
patch/patches/runhooks.patch
View File

@@ -1,8 +1,8 @@
diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
index 9c936c69d684..13be02ae33f8 100644 index 9c936c69d684..40825f4950b7 100644
--- build/toolchain/win/setup_toolchain.py --- build/toolchain/win/setup_toolchain.py
+++ build/toolchain/win/setup_toolchain.py +++ build/toolchain/win/setup_toolchain.py
@@ -142,22 +142,25 @@ def _LoadToolchainEnv(cpu, sdk_dir, target_store): @@ -142,21 +142,29 @@ def _LoadToolchainEnv(cpu, sdk_dir, target_store):
# variable. # variable.
if 'VSINSTALLDIR' in os.environ: if 'VSINSTALLDIR' in os.environ:
del os.environ['VSINSTALLDIR'] del os.environ['VSINSTALLDIR']
@@ -14,34 +14,31 @@ index 9c936c69d684..13be02ae33f8 100644
- raise Exception('%s is missing - make sure VC++ tools are installed.' % - raise Exception('%s is missing - make sure VC++ tools are installed.' %
- script_path) - script_path)
- script_path = other_path - script_path = other_path
- cpu_arg = "amd64" + if not os.path.exists(script_path):
- if (cpu != 'x64'): + # Compiler environment variables must already be specified.
- # x64 is default target CPU thus any other CPU requires a target set
- cpu_arg += '_' + cpu
- args = [script_path, cpu_arg]
- # Store target must come before any SDK version declaration
- if (target_store):
- args.append(['store'])
- variables = _LoadEnvFromBat(args)
+ if os.path.exists(script_path):
+ cpu_arg = "amd64"
+ if (cpu != 'x64'):
+ # x64 is default target CPU thus any other CPU requires a target set
+ cpu_arg += '_' + cpu
+ args = [script_path, cpu_arg]
+ # Store target must come before any SDK version declaration
+ if (target_store):
+ args.append(['store'])
+ variables = _LoadEnvFromBat(args)
+ else:
+ variables = [] + variables = []
+ for k in sorted(os.environ.keys()): + for k in sorted(os.environ.keys()):
+ variables.append('%s=%s' % (str(k), str(os.environ[k]))) + variables.append('%s=%s' % (str(k), str(os.environ[k])))
+ variables = '\n'.join(variables) + variables = '\n'.join(variables)
+ return _ExtractImportantEnvironment(variables)
+ +
cpu_arg = "amd64"
if (cpu != 'x64'):
# x64 is default target CPU thus any other CPU requires a target set
cpu_arg += '_' + cpu
- args = [script_path, cpu_arg]
+ args = [script_path, cpu_arg, ]
# Store target must come before any SDK version declaration
if (target_store):
- args.append(['store'])
+ args.append('store')
+ # Explicitly specifying the SDK version to build with to avoid accidentally
+ # building with a new and untested SDK. This should stay in sync with the
+ # packaged toolchain in build/vs_toolchain.py.
+ args.append('10.0.18362.0')
variables = _LoadEnvFromBat(args)
return _ExtractImportantEnvironment(variables) return _ExtractImportantEnvironment(variables)
diff --git build/vs_toolchain.py build/vs_toolchain.py diff --git build/vs_toolchain.py build/vs_toolchain.py
index f3557ad32eea..b3e056acccdb 100755 index f3557ad32eea..b3e056acccdb 100755
--- build/vs_toolchain.py --- build/vs_toolchain.py