solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 9815505ce8568f2fa67b2f1cd3474eb3f4d1f3c9
Author: Patrick Luby <guibmac...@gmail.com>
AuthorDate: Thu Aug 14 13:48:44 2025 -0400
Commit: Patrick Luby <guibomac...@gmail.com>
CommitDate: Thu Aug 14 21:57:12 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/+/189635
Tested-by: Jenkins
Reviewed-by: Patrick Luby <guibomac...@gmail.com>
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index fccc834039d7..9426178f3d83 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 \
