[Libreoffice-commits] core.git: solenv/gbuild

[Noel Grandin (via logerrit)]

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

New commits:
commit 424a7f404565e068995e2a9827d5bc6f76920ec8
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Feb 13 08:24:10 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Feb 14 08:08:17 2020 +0100

    add some more libs to libmerged
    
    Change-Id: I9e1677c26cf082ed78765995bfa7f57ff50f8e7c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88580
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index a654adc68b44..c5494fde44b5 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -45,9 +45,15 @@ MERGE_LIBRARY_LIST := \
 	fwk \
 	fwl \
 	$(if $(filter WNT,$(OS)),gdipluscanvas) \
+	guesslang \
 	$(call gb_Helper_optional,DESKTOP,helplinker) \
+	hyphen \
+	i18nsearch \
 	i18npool \
 	i18nutil \
+	io \
+	$(if $(ENABLE_JAVA),javaloader) \
+	$(if $(ENABLE_JAVA),javavm) \
 	lng \
 	localebe1 \
 	mcnttype \