diff options
author | Jan Holesovsky <kendy@collabora.com> | 2016-07-11 15:34:01 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2016-07-11 16:00:03 +0200 |
commit | a125527a0d1a81a3f1089cebbb91dbc5e7890b68 (patch) | |
tree | a3da91f7c7bfac6c86ada415c13c69e575f544e9 /solenv/gbuild/extensions | |
parent | Remove these from the customization dialog (diff) | |
download | core-a125527a0d1a81a3f1089cebbb91dbc5e7890b68.tar.gz core-a125527a0d1a81a3f1089cebbb91dbc5e7890b68.zip |
Fix --enable-mergelibs build.
Change-Id: I839b9f8769508b8b4cc4e766db51188353767b0c
Diffstat (limited to 'solenv/gbuild/extensions')
-rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 8007f30a101b..8c00bd32ca7c 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 \ |