summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2021-04-18 19:10:20 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-04-18 21:40:07 +0200
commit6064446f828f8cd612f7d6660153b2eb1139239b (patch)
tree0b427a07122f19a34f2bda690a448dd811c0545b /solenv
parentab4a244d980061d8f68766c1b9662e07c268d62c (diff)
tdf#132901: do not add updatecheck to libmerged
LibreOffice crashes if "online update" feature is not installed Regression from c63148ba139bd6b9ae7a0f9e24e51f29e5370963 < Revert "Revert "add some libs to libmerged"" > Change-Id: Ia18f50bc6baf830b2d3e0814645ef04283bfaa04 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114247 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index dfd3ebdc227e..12fd14edf522 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -92,10 +92,6 @@ MERGE_LIBRARY_LIST := \
ucptdoc1 \
unordf \
unoxml \
- $(if $(ENABLE_ONLINE_UPDATE), \
- updatecheckui \
- updchk \
- ) \
updatefeed \
utl \
uui \