Changeset 106778 in vbox

Timestamp:

Oct 29, 2024 4:06:22 PM (5 months ago)

Author:

vboxsync

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

165669

Message:

tools/envSub.vbs: Add the win.amd64 bin directories to the Path on arm64 as we're still missing bits and pieces. jiraref:VBP-1253

File:

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

trunk/tools/envSub.vbs

@@ -121 +121 @@
    strHost        = EnvGetDefValid("KBUILD_HOST",        "win", arrTargetAndHosts)
    strHostArch    = EnvGetDefValid("KBUILD_HOST_ARCH",   strRealArch, arrArchitectures)
+
+   dim strAltHostArch
+   strAltHostArch = ""
+   if strHostArch = "arm64" then
+      strAltHostArch = "amd64"
+   end if
 
    '
@@ -267 +273 @@
       ' precedence over the dated gnuwin32 stuff.
       EnvAppendPathItem "Path", DosSlashes(strPathkBuild & "\bin\win." & strHostArch & "\wrappers"), ";"
+      if strAltHostArch <> "" then EnvAppendPathItem "Path", DosSlashes(strPathkBuild & "\bin\win." & strAltHostArch & "\wrappers"), ";"
 
       ' Add some gnuwin32 tools to the end of the path.
@@ -336 +343 @@
 
    ' Add kbuild binary directory to the front the the path.
+   if strAltHostArch <> "" then EnvPrependPathItem "Path", DosSlashes(strPathkBuild & "\bin\win." & strAltHostArch), ";"
    EnvPrependPathItem "Path", DosSlashes(strPathkBuild & "\bin\win." & strHostArch), ";"
 
@@ -341 +349 @@
    EnvPrependPathItem "Path", DosSlashes(strPathDevTools & "\bin"), ";"
    if strHostArch = "amd64" then EnvPrependPathItem "Path", DosSlashes(strPathDevTools & "\win.x86\bin"), ";"
+   if strAltHostArch <> ""  then EnvPrependPathItem "Path", DosSlashes(strPathDevTools & "\win." & strAltHostArch & "\bin"), ";"
    EnvPrependPathItem "Path", DosSlashes(strPathDevTools & "\win." & strHostArch) & "\bin", ";"