Skip to content

Commit

Permalink
clang update.py: Make DIA backwards compatible
Browse files Browse the repository at this point in the history
Fix after https://codereview.chromium.org/1879753002/ to
continue supporting MSVS 2013.

BUG=603011

Review URL: https://codereview.chromium.org/1888883004

Cr-Commit-Position: refs/heads/master@{#387580}
  • Loading branch information
mi-ac authored and Commit bot committed Apr 15, 2016
1 parent 5ab0249 commit f569b92
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion tools/clang/scripts/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@
if 'LLVM_REPO_URL' in os.environ:
LLVM_REPO_URL = os.environ['LLVM_REPO_URL']

# Bump after VC updates.
DIA_DLL = {
'2013': 'msdia120.dll',
'2015': 'msdia140.dll',
}


def DownloadUrl(url, output_file):
"""Download url into output_file."""
Expand Down Expand Up @@ -354,7 +360,7 @@ def GetVSVersion():
def CopyDiaDllTo(target_dir):
# This script always wants to use the 64-bit msdia*.dll.
dia_path = os.path.join(GetVSVersion().Path(), 'DIA SDK', 'bin', 'amd64')
dia_dll = os.path.join(dia_path, 'msdia140.dll') # Bump after VC updates.
dia_dll = os.path.join(dia_path, DIA_DLL[GetVSVersion().ShortName()])
CopyFile(dia_dll, target_dir)


Expand Down

0 comments on commit f569b92

Please sign in to comment.