diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 10:27:46 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 10:27:46 +0000 |
| commit | e745f014846e2737bc0a9874d7ccd1de0356b7f3 (patch) | |
| tree | 941280de26af6d5f6786a49fbdf9217a300dd22e /jvmfwk | |
| parent | 72c1a7fbd9d9b483968495bad548246fff19ee0a (diff) | |
INTEGRATION: CWS sixtyfour09 (1.12.10); FILE MERGED
2006/11/09 15:19:07 cmc 1.12.10.1: #ii70963# legacy location for libgcj on some x86_64 distros
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx index 4c16e2da8245..b699720eb713 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.12 $ + * $Revision: 1.13 $ * - * last change: $Author: vg $ $Date: 2006-09-27 10:54:01 $ + * last change: $Author: vg $ $Date: 2006-11-22 11:27:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -192,6 +192,28 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) } } } + +#ifdef X86_64 + //Make one last final legacy attempt on x86_64 in case the distro placed it in lib64 instead + if (!bRt && m_sJavaHome != rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib"))) + { + m_sHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib64")); + for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++) + { + //Construct an absolute path to the possible runtime + OUString usRt= m_sHome + *ip; + DirectoryItem item; + if(DirectoryItem::get(usRt, item) == File::E_None) + { + //found runtime lib + m_sRuntimeLibrary = usRt; + bRt = true; + break; + } + } + } +#endif + if (!bRt) return false; |