solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 9edf64e3e722d8f2f7d14ef2916b29241d3f5ffc Author: Andras Timar <[email protected]> AuthorDate: Wed Feb 18 11:10:23 2026 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Wed Feb 18 13:16:30 2026 +0100 pre_MergedLibsList: make helplinker conditional on XMLHELP too helplinker was included in the merged library whenever DESKTOP was set, but DESKTOP is true for all Linux builds including LOKit/ Collabora Online. Guard it with both DESKTOP and XMLHELP so it is only pulled in when XML help is actually being built. Change-Id: I4b2f8e3a7c1d5e9f0a6b3c8d2e4f7a1b5c9d3e6f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199606 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 2c4e2c68e2b7..ac7ec995b87b 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -50,7 +50,7 @@ gb_MERGE_LIBRARY_LIST := \ fwk \ $(if $(filter WNT,$(OS)),gdipluscanvas) \ guesslang \ - $(call gb_Helper_optional,DESKTOP,helplinker) \ + $(call gb_Helper_optionals_and,DESKTOP XMLHELP,helplinker) \ hyphen \ i18nsearch \ i18npool \
