solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 +
1 file changed, 1 insertion(+)
New commits:
commit a125527a0d1a81a3f1089cebbb91dbc5e7890b68
Author: Jan Holesovsky <ke...@collabora.com>
Date: Mon Jul 11 15:34:01 2016 +0200
Fix --enable-mergelibs build.
Change-Id: I839b9f8769508b8b4cc4e766db51188353767b0c
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 8007f30..8c00bd3 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -37,6 +37,7 @@ MERGE_LIBRARY_LIST := \
localebe1 \
mcnttype \
msfilter \
+ $(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \
package2 \
sax \
sb \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
