Changeset 89799 in vbox

Timestamp:

Jun 20, 2021 10:43:39 PM (4 years ago)

Author:

vboxsync

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

145256

Message:

/Makefile.kmk: Only prepend VBOX_JAVA_BIN_PATH to PATH when executing doxygen iff the java version there is 1.7 or later. Current plantuml.jar is built targeting 1.7. bugref:9890

File:

• trunk/Makefile.kmk (modified) (1 diff)

trunk/Makefile.kmk

@@ -946 +946 @@
         $(QUIET)$(RM) -f $@
         $(QUIET)$(RM) -Rf $(VBOX_CORE_DOXYFILE_OUTPUT)/html/
-        $(REDIRECT) -E "PATH=$(VBOX_JAVA_BIN_PATH)$(HOST_PATH_SEP)$(PATH)" -- doxygen $(VBOX_CORE_DOXYFILE_OUTPUT)/Doxyfile.Core
+        $(if-expr $(VBOX_JAVA_VERSION)+0 >= 70000, $(REDIRECT) -E "PATH=$(VBOX_JAVA_BIN_PATH)$(HOST_PATH_SEP)$(PATH)" --,) \
+                doxygen $(VBOX_CORE_DOXYFILE_OUTPUT)/Doxyfile.Core
         $(SED) -n \
                -e ':nextwarning' \