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 /solenv/gbuild/extensions | |
| 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 'solenv/gbuild/extensions')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 5c4db5957080..2c2e59479465 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -180,8 +180,6 @@ gb_MERGE_LIBRARY_LIST += \ sdbc2 \ $(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \ slideshow \ - sm \ - smd \ $(if $(filter WNT,$(OS)), \ smplmail \ ) \ |