From 4f829bb6497c48efe1074487c4fea7c7e7e760e0 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 11 Mar 2016 17:31:23 -0500 Subject: Try to get clang/win tot bots going again after VS2015 update. We wanted to always get VS2013 from gyp (since that's most-tested for LLVM builds), but apparently compiler and library versions get out of sync if we don't request the default VS version. So do that. BUG=none R=brucedawson@chromium.org Review URL: https://codereview.chromium.org/1790433009 . Cr-Commit-Position: refs/heads/master@{#380758} --- tools/clang/scripts/update.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/clang') diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py index b005520..1e24d7c 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py @@ -339,7 +339,8 @@ def GetVSVersion(): # or a system-wide installation otherwise. sys.path.append(os.path.join(CHROMIUM_DIR, 'tools', 'gyp', 'pylib')) import gyp.MSVSVersion - vs_version = gyp.MSVSVersion.SelectVisualStudioVersion('2013') + vs_version = gyp.MSVSVersion.SelectVisualStudioVersion( + vs_toolchain.GetVisualStudioVersion()) return vs_version -- cgit v1.1