diff options
| author |  Brian Osman <brianosman@google.com> | 2017-12-06 13:26:38 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-06 19:15:55 +0000 |
| commit | d34c4a37276c240733a6d17812653636dc3656b5 (patch) | |
| tree | 84e84b67935ad7475fb015aa867a5adb70493847 /gn/toolchain | |
| parent | 1c80ea828373c3ae3f691c29933cede3c031f407 (diff) | |
Add win_toolchain_version to support MSVC 2017 Updates
To make this simpler in the future, add a python script that finds the
most recent 2017 toolchain, and use that. If/when we update the bot
toolchain, this will be even more helpful, because the Chromium toolchain
isn't perfectly in sync with the general update channel, so people are
likely to have a newer/older release locally.
Note that explicitly setting win_toolchain_version in your GN args
suppresses the python script, so you can choose to build with whatever
version you need.
Bug: skia:
Change-Id: Iaf6d0dd9be2623472118c3ad27b20023a205d67c
Reviewed-on: https://skia-review.googlesource.com/81162
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'gn/toolchain')
| -rw-r--r-- | gn/toolchain/BUILD.gn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn index 59d83e43d7..7497bcb690 100644 --- a/gn/toolchain/BUILD.gn +++ b/gn/toolchain/BUILD.gn @@ -41,7 +41,7 @@ toolchain("msvc") { env_setup = "cmd /c $windk/win_sdk/bin/SetEnv.cmd /x86 && " } } else { - bin = "$windk/VC/Tools/MSVC/14.10.25017/bin/HostX64/$target_cpu" + bin = "$windk/VC/Tools/MSVC/$win_toolchain_version/bin/HostX64/$target_cpu" env_setup = "" if (target_cpu == "x86") { print("Be sure to run") |