Bug 1391547 - DIA SDK is missing when using MSVS2017. r?ted.mielczarek draft
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Tue, 22 Aug 2017 15:16:07 +0900
changeset 650320 ed4ec5bb72db6b8a5c205eb6136e45dd85867010
parent 650228 128a79130ecd6f277190d031a623f991c73c5272
child 727365 3b507cb0cfaa340d6fe24a04a2d7e760b037e7c7
push id75344
push userbmo:m_kato@ga2.so-net.ne.jp
push dateTue, 22 Aug 2017 06:54:22 +0000
bugs1391547, 25503
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')
             # 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)
 def include_path(vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir):
     if not vc_path: