Changeset 33349 in vbox

Timestamp:

Oct 22, 2010 12:52:20 PM (15 years ago)

Author:

vboxsync

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

66932

Message:

Config: try to find JDK in more places on Darwin

File:

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

trunk/Config.kmk

@@ -4346 +4346 @@
 # Java stuff.
 ifeq ($(KBUILD_TARGET), darwin)
- VBOX_JAVA_HOME = /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0
+ VBOX_JAVA_HOME = $(firstword $(wildcard \
+        /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0 \
+        /Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0 \
+        ) /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0)
  VBOX_JAVAC     = $(VBOX_JAVA_HOME)/Commands/javac
  VBOX_JAVAH     = $(VBOX_JAVA_HOME)/Commands/javah