Reland "Switch to VS 2017 15.7.1 with 10.0.17134.0 SDK"
This is a reland of 5a7f3c442684be5eeb244b904bbfc8e6edaf6fda goma now supports this compiler and the new warnings were dealt with. Original change's description: > Switch to VS 2017 15.7.1 with 10.0.17134.0 SDK > > This change switches the VS 2017 package to use VS 2017 Update 7.1 while > using the 10.0.17134.12 SDK. The new SDK is needed to support new HDR > features, and to stop forcing external developers to install an old > ([Spring] Creators Update) SDK. This change will also bring in a new > linker and other build tools, but the version of clang-cl will be > unchanged. > > Packaging was done on a Windows Server 2016 VM, cleanly created for this > purpose. > > Compiler was packaged up by downloading VS 2017 Update 7.1, from > https://www.visualstudio.com/vs/, and then passing these parameters to > the installer: > > --add Microsoft.VisualStudio.Workload.NativeDesktop > --add Microsoft.VisualStudio.Component.VC.ATLMFC --includeRecommended > --passive > > Then Add or Remove Programs was used to modify the 10.0.17134.0 SDK to add > the Debuggers package. > > Then the packaging script was run like this: > > python depot_tools\win_toolchain\package_from_installed.py 2017 -w 10.0.17134.0 > > Bug: 773476 > Change-Id: Ic819f3ae79d7e869227bf33fbb8d202e2f57039b > Reviewed-on: https://chromium-review.googlesource.com/1054027 > Reviewed-by: Nico Weber <thakis@chromium.org> > Reviewed-by: Dirk Pranke <dpranke@chromium.org> > Commit-Queue: Bruce Dawson <brucedawson@chromium.org> > Cr-Commit-Position: refs/heads/master@{#559033} Bug: 773476,834213 Change-Id: I903158f9dfa604f250010a7047496509f51782e7 Reviewed-on: https://chromium-review.googlesource.com/1066130 Reviewed-by: Nico Weber <thakis@chromium.org> Reviewed-by: Dirk Pranke <dpranke@chromium.org> Commit-Queue: Bruce Dawson <brucedawson@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#560002} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 82a5f004e0e52897a6e8bac10490a14fc2845625
This commit is contained in:
Родитель
0b9cc34b81
Коммит
2273e4bf46
|
@ -149,10 +149,9 @@ def _LoadToolchainEnv(cpu, sdk_dir, target_store):
|
|||
# Store target must come before any SDK version declaration
|
||||
if (target_store):
|
||||
args.append(['store'])
|
||||
# Chromium requires the 10.0.15063.468 SDK - previous versions don't have
|
||||
# all of the required declarations and 10.0.16299.0 has some
|
||||
# incompatibilities (crbug.com/773476).
|
||||
args.append('10.0.15063.0')
|
||||
# Chromium requires the 10.0.17134.0 SDK - previous versions don't have
|
||||
# all of the required declarations.
|
||||
args.append('10.0.17134.0')
|
||||
variables = _LoadEnvFromBat(args)
|
||||
return _ExtractImportantEnvironment(variables)
|
||||
|
||||
|
|
|
@ -335,7 +335,7 @@ def _CopyDebugger(target_dir, target_cpu):
|
|||
# TODO(crbug.com/773476): remove version requirement.
|
||||
raise Exception('%s not found in "%s"\r\nYou must install the '
|
||||
'"Debugging Tools for Windows" feature from the Windows'
|
||||
' 10 SDK. You must use v10.0.15063.468. of the SDK'
|
||||
' 10 SDK. You must use v10.0.17134.0. of the SDK'
|
||||
% (debug_file, full_path))
|
||||
target_path = os.path.join(target_dir, debug_file)
|
||||
_CopyRuntimeImpl(target_path, full_path)
|
||||
|
@ -346,9 +346,8 @@ def _GetDesiredVsToolchainHashes():
|
|||
to build with."""
|
||||
env_version = GetVisualStudioVersion()
|
||||
if env_version == '2017':
|
||||
# VS 2017 Update 3.2 with 10.0.15063.468 SDK, patched setenv.cmd, and
|
||||
# 10.0.16299.15 debuggers.
|
||||
toolchain_hash = '1180cb75833ea365097e279efb2d5d7a42dee4b0'
|
||||
# VS 2017 Update 7.1 (15.7.1) with 10.0.17134.12 SDK.
|
||||
toolchain_hash = '5454e45bf3764c03d3fc1024b3bf5bc41e3ab62c'
|
||||
# Third parties that do not have access to the canonical toolchain can map
|
||||
# canonical toolchain version to their own toolchain versions.
|
||||
toolchain_hash_mapping_key = 'GYP_MSVS_HASH_%s' % toolchain_hash
|
||||
|
|
Загрузка…
Ссылка в новой задаче