Changeset 93046 in vbox for trunk/tools/envSub.vbs

Timestamp:

Dec 21, 2021 12:37:01 PM (3 years ago)

Author:

vboxsync

Message:

tools/envSub.vbs: Add the kBuild\win.*\wrappers dir to the PATH before gnuwin32\bin, so we can enjoy a newer grep that doesn't barf on trailing directory slashes.

File:

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

trunk/tools/envSub.vbs

@@ -245 +245 @@
    for each str1 in arrArchitectures
       EnvRemovePathItem "Path", DosSlashes(strPathkBuild & "\bin\win." & str1), ";"
+      EnvRemovePathItem "Path", DosSlashes(strPathkBuild & "\bin\win." & str1 & "\wrappers"), ";"
       EnvRemovePathItem "Path", DosSlashes(strPathDevTools & "\win." & str1) & "\bin", ";"
    next
@@ -253 +254 @@
    '
    if ArraySize(arrCmdToExec) = 0 then
+      ' Add the kbuild wrapper directory to the end of the path, these take
+      ' precedence over the dated gnuwin32 stuff.
+      EnvAppendPathItem "Path", DosSlashes(strPathkBuild & "\bin\win." & strHostArch & "\wrappers"), ";"
+
       ' Add some gnuwin32 tools to the end of the path.
       EnvAppendPathItem "Path", DosSlashes(strPathDevTools & "\win.x86\gnuwin32\r1\bin"), ";"