core.git: Branch 'libreoffice-25-8' - solenv/gbuild

[Patrick Luby (via logerrit)]

 solenv/gbuild/extensions/pre_MergedLibsList.mk |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 8f749cd4b3b86e5becf91eb038a1de9d9bcff0ce
Author:     Patrick Luby <guibmac...@gmail.com>
AuthorDate: Thu Aug 14 13:48:44 2025 -0400
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Aug 14 22:38:29 2025 +0200

    tdf#167916 Skip merging of the macabdrv1 library
    
    macabdrv1 symbols can't be loaded with --enable-mergelibs=more so
    leave it unmerged.
    
    Change-Id: If88059783ebc2be29a9011244947671891801cab
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189638
    Reviewed-by: Patrick Luby <guibomac...@gmail.com>
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 6e0439af7d82..a3d9371a7cc2 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -157,7 +157,6 @@ gb_MERGE_LIBRARY_LIST += \
        $(if $(ENABLE_LWP),lwpft) \
        $(if $(filter $(OS),MACOSX), \
                macab1 \
-               macabdrv1 \
        ) \
        mozbootstrap \
        msforms \