Bug 1391547 - DIA SDK is missing when using MSVS2017. r?ted.mielczarek
MSVC path: C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.11.25503
DIA SDK path: C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\DIA SDK
dia_sdk_dir of windows.configure tries finding invalid path.
MozReview-Commit-ID: KQDNA1tdpW2
--- a/build/moz.configure/windows.configure
+++ b/build/moz.configure/windows.configure
@@ -257,17 +257,17 @@ def vc_path(c_compiler):
@imports(_from='os.path', _import='isdir')
def dia_sdk_dir(vc_path, c_compiler):
if vc_path:
if c_compiler.version < '19.10':
path = os.path.join(os.path.dirname(vc_path), 'DIA SDK')
else:
# This would be easier if we had the installationPath that
# get_vc_paths works with, since 'DIA SDK' is relative to that.
- path = os.path.normpath(os.path.join(vc_path, r'..\..\..\..\..\..\..\DIA SDK'))
+ path = os.path.normpath(os.path.join(vc_path, r'..\..\..\..\DIA SDK'))
if isdir(path):
return path
@depends(vc_path, valid_windows_sdk_dir, valid_ucrt_sdk_dir, dia_sdk_dir)
@imports('os')
def include_path(vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir):
if not vc_path: