Changeset 106804 in vbox

Timestamp:

Oct 31, 2024 1:13:45 AM (5 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165702

Message:

tools/envSub.vbs: Visual C++ selection update, now adding Llvm's bin dir when present. jiraref:VBP-1253

File:

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

trunk/tools/envSub.vbs

@@ -302 +302 @@
       next
 
-      ' Add VCC to the end of the path.
+      ' Add VCC and Llvm to the end of the path.
       dim str2, strDir2, arrVccOldBinDirs
       arrVccOldBinDirs = Array("\bin\" & strHostArch & "_" & strTargetArch, "\bin\" & strTargetArch, "\bin")
       bldExitLoop = false
-      for each str1 in Array("amd64", "x86")
-         for each strDir in GetSubdirsStartingWithRVerSorted(strPathDevTools & "\win." & str1 & "\vcc", "v")
-            strDir = strPathDevTools & "\win." & str1 & "\vcc\" & strDir
+      for each str1 in Array("", ".amd64", ".x86")
+         for each strDir in GetSubdirsStartingWithRVerSorted(strPathDevTools & "\win" & str1 & "\vcc", "v")
+            strDir = strPathDevTools & "\win" & str1 & "\vcc\" & strDir
             if DirExists(strDir & "\Tools\MSVC") then
                for each strDir2 in GetSubdirsStartingWithRVerSorted(strDir & "\Tools\MSVC", "1")
@@ -322 +322 @@
                   end if
                next
+               if bldExitLoop and DirExists(strDir & "\Tools\Llvm\") then
+                  if strHostArch = "x86" then
+                     strDir2 = strDir & "\Tools\Llvm\bin"
+                  else
+                     strDir2 = strDir & "\Tools\Llvm\" & XlateArchitectureToWin(strHostArch) & "\bin"
+                  end if
+                  if DirExists(strDir2) then
+                     EnvAppendPathItem "Path", DosSlashes(strDir2), ";"
+                  end if
+               end if
             elseif DirExists(strDir & "\bin") then
                for each str2 in arrVccOldBinDirs