diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-04-18 19:10:20 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-04-21 21:07:30 +0200 |
| commit | 3a814f70063bffea91da64972eb515fe565aeb93 (patch) | |
| tree | 44fa73898966f5945cf4f260370654956a4ff1e6 /solenv | |
| parent | fc5af9295570e3ac0a078608a49b7a2bd91234b1 (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>
(cherry picked from commit 6064446f828f8cd612f7d6660153b2eb1139239b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114191
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 |
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 \ |