diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-29 14:25:23 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-29 14:25:55 +0200 |
| commit | 8541b178f4155c8d72a876245433a1aaf3d2634f (patch) | |
| tree | 2600b56d118f94b5e81cc4fa657d65446096173a /jvmfwk/plugins | |
| parent | tdf#91702 - fix stack-based MessBox allocation. (diff) | |
| download | core-8541b178f4155c8d72a876245433a1aaf3d2634f.tar.gz core-8541b178f4155c8d72a876245433a1aaf3d2634f.zip | |
Support Azul Zulu JRE on Linux and Mac OS X, too
Change-Id: I317506319b91daf006a0ba79874ff265ba6ed4da
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index c84525e5141d..5809522518e6 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -59,7 +59,8 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/server/jvm.dll" // needed by Azul #elif defined UNX #ifdef MACOSX - "/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22 + "/../../../../../Frameworks/JavaVM.framework/JavaVM", //as of 1.6.0_22 + "/lib/server/libjvm.dylib" // needed by Azul #else "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64 |