diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-03-12 17:42:17 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-03-12 20:39:20 +0100 |
| commit | 44a819a466fb553ff5dec97b258144fa75bbe7fd (patch) | |
| tree | a1ebea1c03b324b4274e187af187bbcb875d4762 /idl/source | |
| parent | d3ae37902ee2ded2926b1a41816b33404f1cda1d (diff) | |
Revert "add sm to --enable-mergelibs=more"
This reverts commit 87d3f768f3ecded1e1392442181edb287aed9e2e.
The unit test at
starmath/CppunitTest_starmath_qa_cppunit.mk
is doing
$(eval $(call gb_CppunitTest_use_library_objects,starmath_qa_cppunit,\
sm \
))
which it is using to access to all the internal functions of starmath.
Unfortunately that linking trick is just not compatible with the mergelib linking.
Change-Id: Ie3c81a0eeea5bed192de18981463497f251531a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164730
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'idl/source')
| -rw-r--r-- | idl/source/objects/types.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 3228e1cce378..1089e929043c 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -249,9 +249,7 @@ void SvMetaType::WriteSfxItem( // write the implementation part rOutStm.WriteOString( "#ifdef SFX_TYPEMAP" ) << endl; - rOutStm.WriteOString( "#if defined(_WIN32)" ) << endl; - rOutStm.WriteOString( "__declspec(selectany)" ) << endl; - rOutStm.WriteOString( "#else" ) << endl; + rOutStm.WriteOString( "#if !defined(_WIN32) && (defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(EMSCRIPTEN) || defined(LINUX)))" ) << endl; rOutStm.WriteOString( "__attribute__((__weak__))" ) << endl; rOutStm.WriteOString( "#endif" ) << endl; rOutStm.WriteOString( aTypeName ).WriteOString( aVarName ) |