Changeset 106912 in vbox

Timestamp:

Nov 9, 2024 11:04:56 PM (5 months ago)

Author:

vboxsync

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

165836

Message:

/Config.kmk: Fix VBOX_XSLTPROC determination. jiraref:VBP-1253

File:

• trunk/Config.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -2537 +2537 @@
 ifeq ($(VBOX_XSLTPROC),)
  ifeq ($(KBUILD_HOST),win)
-  VBOX_XSLTPROC := $(wildcard $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)/libxslt/10142/bin/xsltproc.exe)
+  VBOX_XSLTPROC := $(firstfile \
+                $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST)/libxslt/*/bin/xsltproc.exe)) \
+                $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST_ALT)/libxslt/*/bin/xsltproc.exe)) )
   ifeq ($(VBOX_XSLTPROC),)
-   VBOX_XSLTPROC := $(wildcard $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)/libxslt/10128/bin/xsltproc.exe)# for x86
-   ifeq ($(VBOX_XSLTPROC),)
-    VBOX_XSLTPROC := $(KBUILD_DEVTOOLS)/win.x86/bin/xsltproc.exe
-   endif
+   VBOX_XSLTPROC := $(firstfile $(which xsltproc$(HOSTSUFF_EXE)) xsltproc$(HOSTSUFF_EXE))
   endif
  else ifeq ($(KBUILD_HOST),os2)
@@ -3957 +3956 @@
  ifeq ($(KBUILD_HOST),win)
   VBOX_XMLLINT := $(firstfile \
-                $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)/libxslt/*/bin/xmllint.exe)))
+                $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST)/libxslt/*/bin/xmllint.exe)) \
+                $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST_ALT)/libxslt/*/bin/xmllint.exe)) )
  endif
  ifeq ($(VBOX_XMLLINT),)
-  VBOX_XMLLINT := $(which xmllint)
+  VBOX_XMLLINT := $(firstfile $(which xmllint) xmllint$(HOSTSUFF_EXE))
  endif
  ifneq ($(VBOX_XMLLINT),)