solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 189ae6c585219ff0cf4bee44e9477cfd9818b485
Author: Jan Holesovsky <ke...@collabora.com>
Date: Tue Jul 12 12:07:34 2016 +0200
Fix --enable-mergelibs build.
Change-Id: I4520a4c415a9d5d602a281cd59ef2d2b14dd3be7
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index b338570..20cc510 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -12,6 +12,7 @@
MERGE_LIBRARY_LIST := \
avmedia \
$(if $(filter $(OS),ANDROID),,basebmp) \
+ $(if $(filter OPENCL,$(BUILD_TYPE)),clew) \
basegfx \
canvastools \
configmgr \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
