Changeset 106793 in vbox for trunk/tools

Timestamp:

Oct 30, 2024 2:58:06 PM (4 weeks ago)

Author:

vboxsync

Message:

tools/envSub.vbs: Debugger selection update for the new sdk. jiraref:VBP-1253

File:

• trunk/tools/envSub.vbs (modified) (2 diffs)

trunk/tools/envSub.vbs

@@ -126 +126 @@
    if strHostArch = "arm64" then
       strAltHostArch = "amd64"
+   end if
+
+   ' Where to look for host related tools.
+   dim arrArchToolsSuffixes : arrArchToolsSuffixes = Array("", strHostArch & ".")
+   if strAltHostArch <> "" then
+      arrArchToolsSuffixes = ArrayAppend(arrArchToolsSuffixes, strAltHostArch & ".")
+   end if
+   if strHostArch <> "x86" and strAltHostArch <> "x86" then
+      arrArchToolsSuffixes = ArrayAppend(arrArchToolsSuffixes, ".x86")
    end if
 
@@ -281 +290 @@
       dim strDir, blnStop
       bldExitLoop = false
-      for each str1 in arrArchitectures
-         strDir = strPathDevTools & "\win." & str1 & "\sdk"
+      for each str1 in arrArchToolsSuffixes
+         strDir = strPathDevTools & "\win" & str1 & "\sdk"
          for each strSubDir in GetSubdirsStartingWithRVerSorted(strDir, "v")
             if FileExists(strDir & "\" & strSubDir & "\Debuggers\" & XlateArchitectureToWin(strHostArch) & "\windbg.exe") then