diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-08 08:34:09 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-08 08:37:29 +0100 |
| commit | 5e79a328645e6bc2ac3cbd7f2d6b9298772c0598 (patch) | |
| tree | 449a72a7b49833ce65a88b0243dd93fb8d1813c1 /include/LibreOfficeKit | |
| parent | b4fda7b3f9cf928f45baf6846dd70e97cdb9904a (diff) | |
New LOK_LOADLIB_GLOBAL to let clients control dlopen(RTLD_GLOBAL)
...in LibreOfficeKintInit.h's lok_loadlib, now that RTLD_GLOBAL isn't only
needed for UBSan (62b124b2704adf11a63681164d05a8eb49dfb105 "Ensure RTTI symbol
visibility for Linux Clang -fsanitize=function,vptr") but also for
-stdlib=libc++ on Linux (see
<https://whatofhow.wordpress.com/2016/03/01/libclibcabi-on-linux/>).
Change-Id: I24ed6612c3d922eba695423d46af5635c77f7077
Diffstat (limited to 'include/LibreOfficeKit')
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKitInit.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h index a1b2ddc03d03..f1e513e213fc 100644 --- a/include/LibreOfficeKit/LibreOfficeKitInit.h +++ b/include/LibreOfficeKit/LibreOfficeKitInit.h @@ -45,12 +45,9 @@ extern "C" void *lok_loadlib(const char *pFN) { return dlopen(pFN, RTLD_LAZY -#if defined __clang__ && defined __linux__ \ - && defined ENABLE_RUNTIME_OPTIMIZATIONS -#if !ENABLE_RUNTIME_OPTIMIZATIONS +#if defined LOK_LOADLIB_GLOBAL | RTLD_GLOBAL #endif -#endif ); } |