diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-02 20:14:19 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-03 08:24:09 +0100 |
| commit | b8077713987253f6db0887ddad56fd6871374a8b (patch) | |
| tree | 4e829b37e8fa6b248bba5857a045a1bf18968297 /solenv/gbuild/extensions | |
| parent | e796f172aaaded731b6060450e9e83d39f4639af (diff) | |
Revert "add some libs to libmerged"
This reverts commit 4ec76bdeeb000881cf46c78166dc02badb4f44db.
Revert this for now to get the TB77 builds working again.
Change-Id: I345ad54b5bc8e8a06dfba539c2cee8822a350f93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89802
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'solenv/gbuild/extensions')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 976de14e8967..9cb91a5d4a15 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -83,24 +83,13 @@ MERGE_LIBRARY_LIST := \ svx \ svxcore \ syssh \ - textfd \ tk \ tl \ ucb1 \ ucbhelper \ ucpexpand1 \ - ucpext \ - ucphier1 \ - ucpimage \ ucpfile1 \ - ucptdoc1 \ - unordf \ unoxml \ - $(if $(ENABLE_ONLINE_UPDATE), \ - updatecheckui \ - updchk \ - ) \ - updatefeed \ utl \ uui \ vcl \ |