solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 67763e3c45ff3a1f9df8edecf16c691ff8a053bd
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Dec 13 14:17:32 2021 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Mon Dec 13 16:38:16 2021 +0100
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 <glo...@fbihome.de>
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 \
