diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 15:19:44 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 15:19:44 +0000 |
| commit | 2f7f52475ce3feafde11d379f01d7586cf1702d6 (patch) | |
| tree | 28c8c744cce3efe7e45f97b0a4bb3de8ad47d815 /jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | |
| parent | a35ecbd6ad9295eb41286e715717b445e9f94289 (diff) | |
INTEGRATION: CWS gcjsix (1.9.12); FILE MERGED
2006/08/02 10:06:16 cmc 1.9.12.1: #i64918# gcj will change it's jvm providing library to the sunalike libjvm.so
Diffstat (limited to 'jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx index 8f25d1aa6e90..5ed2eb7b70d1 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx @@ -4,9 +4,9 @@ * * $RCSfile: gnujre.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2006-06-20 00:08:40 $ + * last change: $Author: hr $ $Date: 2006-08-11 16:19:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -63,6 +63,8 @@ char const* const* GnuInfo::getJavaExePaths(int * size) char const* const* GnuInfo::getRuntimePaths(int * size) { static char const* ar[]= { + "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", + "/gcj-4.1.1/libjvm.so", "/libgcj.so.7", "/libgcj.so.6" }; |