Changeset 106905 in vbox

Timestamp:

Nov 9, 2024 1:43:34 AM (5 months ago)

Author:

vboxsync

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

165828

Message:

/Config.kmk: VBOX_XMLLINT/VBOX_HAVE_XMLLINT confusion. jiraref:VBP-1253

File:

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

trunk/Config.kmk

@@ -3599 +3599 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_HAVE_FLEX                           ?= $(firstfile $(TOOL_FLEX_LEX) $(which flex))'
         $(QUIET)$(APPEND) '$@' 'VBOX_HAVE_BISON                          ?= $(firstfile $(TOOL_BISON_YACC) $(which bison))'
-        $(QUIET)$(APPEND) '$@' 'VBOX_HAVE_XMLLINT                        ?= $(which xmllint)'
  if "$(KBUILD_HOST)" == "solaris" && $(KBUILD_HOST_VERSION_MAJOR) == 5 && $(KBUILD_HOST_VERSION_MINOR) == 11
   # BRANCH_VERSION format on S11 - S11.3:
@@ -3957 +3956 @@
 ifeq ($(VBOX_XMLLINT),)
  ifeq ($(KBUILD_HOST),win)
-  VBOX_XMLLINT := $(wildcard $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)/libxslt/10128/bin/xmllint.exe)
+  VBOX_XMLLINT := $(firstfile \
+        $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)/libxslt/*/bin/xmllint.exe)))
  endif
  ifeq ($(VBOX_XMLLINT),)
-  VBOX_XMLLINT := $(VBOX_HAVE_XMLLINT)
+  VBOX_XMLLINT := $(which xmllint)
  endif
  ifneq ($(VBOX_XMLLINT),)