Changeset 89428 in vbox

Timestamp:

Jun 1, 2021 11:47:30 AM (4 years ago)

Author:

vboxsync

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

144782

Message:

/Config.kmk: On darwin host check also in the directories which seem to be used now by newer JDK 8 updates (found no hint in the changelog that the Framework structure was dropped, but this was the case on one developer's system set up yesterday).

File:

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

trunk/Config.kmk

@@ -2891 +2891 @@
         /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Commands \
         $(if-expr $(VBOX_XCODE_VERSION_MAJOR) >= 4,/System/Library/Frameworks/JavaVM.framework/Versions/A/Commands,) \
-        ) /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Commands)
+        $(if-expr $(VBOX_XCODE_VERSION_MAJOR) >= 10,/Library/Java/JavaVirtualMachines/jdk1.8.*.jdk/Contents/Home/bin,) \
+        ) /usr/bin)
  VBOX_JAVA      = $(VBOX_JAVA_COMMANDS)/java
  VBOX_JAVAC     = $(VBOX_JAVA_COMMANDS)/javac
@@ -2899 +2900 @@
  VBOX_WSIMPORT  = $(VBOX_JAVA_COMMANDS)/wsimport
  if $(VBOX_XCODE_VERSION_MAJOR) >= 4 # Lion (4.1-preview 5) has a broken CurrentJDK link.  Blindly applying it to 4.0.
-  VBOX_JAVA_INC = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers
+  VBOX_JAVA_INC = $(firstword $(wildcard \
+        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers \
+        /Library/Java/JavaVirtualMachines/jdk1.8.*.jdk/Contents/Home/include \
+        ) )
  else
   VBOX_JAVA_INC = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Headers