summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2010-10-21 16:14:09 +0200
committerJoachim Lingner <jl@openoffice.org>2010-10-21 16:14:09 +0200
commit95b9ae9cd7ba53bff25533397878d49adffebee0 (patch)
treed5845c7955917a06f320084413685851c592f17a
parent5c04ffa2a50e3d61cc9beae038e9069713cdefca (diff)
jl162 #i115180# OOo does not find VM runtime library of Java 1.6.0_22 on Mac
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index 6dd18ccc9f18..9bc8adfb21db 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -73,7 +73,8 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
"/bin/hotspot/jvm.dll"
#elif UNX
#ifdef MACOSX
- "/../../../JavaVM"
+ "/../../../JavaVM",
+ "/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22
#else
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC
"/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64