summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-09-30 22:09:42 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-09-30 22:09:42 +0200
commit43c47af0181ada27b558a30b02c51dc665169b99 (patch)
tree912547fddcd99edd815fc65c838ede5869d8914d
parent9379a922c07df3cdb7d567cc88dfaaa39ead3681 (diff)
Special-case Mac OS X .jnilib
Change-Id: I824e83271997888712f126f4197252d7beefccc1
-rw-r--r--cppuhelper/source/shlib.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index fc8b6a891dd9..0933ddbb46ca 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -227,7 +227,11 @@ static OUString makeComponentPath(
if (rPath[ rPath.getLength() -1 ] != '/')
buf.append( (sal_Unicode) '/' );
}
- if (! rLibName.endsWithIgnoreAsciiCase( SAL_DLLEXTENSION ))
+ if (!rLibName.endsWithIgnoreAsciiCase( SAL_DLLEXTENSION )
+#if defined MACOSX
+ && !rLibName.endsWithIgnoreAsciiCase(".jnilib")
+#endif
+ )
{
#if defined SAL_DLLPREFIX
if (! rLibName.endsWithIgnoreAsciiCase( ".uno" ))