summaryrefslogtreecommitdiffstats
path: root/tools/clang
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2016-03-11 17:31:23 -0500
committerNico Weber <thakis@chromium.org>2016-03-11 22:33:12 +0000
commit4f829bb6497c48efe1074487c4fea7c7e7e760e0 (patch)
treec40ea7cee90d43629420fef23a07d6238dd63db5 /tools/clang
parent2c3d0b35a81d35bb2b5611c75a762f239605a5ee (diff)
downloadchromium_src-4f829bb6497c48efe1074487c4fea7c7e7e760e0.zip
chromium_src-4f829bb6497c48efe1074487c4fea7c7e7e760e0.tar.gz
chromium_src-4f829bb6497c48efe1074487c4fea7c7e7e760e0.tar.bz2
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}
Diffstat (limited to 'tools/clang')
-rwxr-xr-xtools/clang/scripts/update.py3
1 files changed, 2 insertions, 1 deletions
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