diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-13 14:17:32 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-13 16:38:16 +0100 |
| commit | 67763e3c45ff3a1f9df8edecf16c691ff8a053bd (patch) | |
| tree | 54729224bc6c411d78a50acc9bd868f98b73dea5 /solenv | |
| parent | ae6f41424608b349b45eb3f18ee8c7cff5d6c182 (diff) | |
Drop desktop_detector from mergelibs
Jenkins lo_callgrind_linux job failed with:
.../vcl/Library_desktop_detector.mk:22: \
*** Plugins can't be in mergelibs. Stop.
Regression from commit b2882faf43ea1fa473621d0378c5d87ae3b3d5a2
("desktop_detector is also a vcl plugin").
Change-Id: Idc6d867e38d68006b6e1d8a44746085f36ebc5d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126738
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 12fd14edf522..ab4c3089945a 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -27,7 +27,6 @@ MERGE_LIBRARY_LIST := \ deployment \ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ - $(if $(USING_X11),desktop_detector) \ $(if $(filter WNT,$(OS)),directx9canvas) \ drawinglayer \ editeng \ |