solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 -
1 file changed, 1 deletion(-)
New commits:
commit d2edfa6d86b3bd5be0486793d0ba0bd47f9600d0
Author: Patrick Luby <guibmac...@gmail.com>
AuthorDate: Thu Aug 14 13:48:44 2025 -0400
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Aug 15 08:11:19 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/+/189640
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Reviewed-by: Patrick Luby <guibomac...@gmail.com>
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 3c780ec65199..2007253f065a 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -159,7 +159,6 @@ gb_MERGE_LIBRARY_LIST += \
$(if $(ENABLE_LWP),lwpft) \
$(if $(filter $(OS),MACOSX), \
macab1 \
- macabdrv1 \
) \
mozbootstrap \
msforms \
