core.git: solenv/gbuild

Wed, 31 Jan 2024 23:46:04 -0800 

 solenv/gbuild/extensions/pre_MergedLibsList.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 40045883b04e1c0694f802d98d417c9b48e0f4fd
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu Feb 1 08:13:54 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Feb 1 08:45:40 2024 +0100

    fix --enable-mergelibs build on macOS
    
    by including the spellchecker library into the merged library
    
    Change-Id: I427458005af3b30bfdcd2134ef102852e4c92ea2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162861
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index f6d9d2398a2c..44b9bbc47688 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -54,6 +54,7 @@ gb_MERGE_LIBRARY_LIST := \
        lng \
        lnth \
        localebe1 \
+       $(if $(filter iOS MACOSX,$(OS)),MacOSXSpell) \
        msfilter \
        mtfrenderer \
        numbertext \

Reply via email to