Commit 1d6dca0c authored by Marshall Greenblatt's avatar Marshall Greenblatt Committed by Commit Bot

Windows: Fix clang/scripts/update.py failure

Fix clang/scripts/update.py failure with DEPOT_TOOLS_WIN_TOOLCHAIN=0
and non-standard VS install location.

If GYP_MSVS_OVERRIDE_PATH is set that value should be used instead of
calling vs_toolchain.DetectVisualStudioPath().

R=brucedawson@chromium.org

Bug: 863130
Change-Id: Id72b1a22f74c5fa9174a76d611fef9ca69bb8319
Reviewed-on: https://chromium-review.googlesource.com/1135761Reviewed-by: default avatarBruce Dawson <brucedawson@chromium.org>
Reviewed-by: default avatarHans Wennborg <hans@chromium.org>
Commit-Queue: Marshall Greenblatt <marshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579056}
parent 5c7acf2d
......@@ -392,7 +392,10 @@ def GetWinSDKDir():
if bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1'))):
dia_path = os.path.join(win_sdk_dir, '..', 'DIA SDK', 'bin', 'amd64')
else:
vs_path = vs_toolchain.DetectVisualStudioPath()
if 'GYP_MSVS_OVERRIDE_PATH' not in os.environ:
vs_path = vs_toolchain.DetectVisualStudioPath()
else:
vs_path = os.environ['GYP_MSVS_OVERRIDE_PATH']
dia_path = os.path.join(vs_path, 'DIA SDK', 'bin', 'amd64')
dia_dll = os.path.join(dia_path, DIA_DLL[msvs_version])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment