summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-12-19 11:54:37 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-12-19 13:00:22 +0000
commit9d7315df825762ef03f47c56dd078d7b1724f1cf (patch)
treea417fe1cf6e045a301c629c5e5a7c4fedb73fe82 /solenv
parent002a83fca94dd34cc30a58162c3316e371478308 (diff)
lets always have at least dbtools
Change-Id: I72f768ad760fd9fa1e3ec988e5217672bca9c824 Reviewed-on: https://gerrit.libreoffice.org/32175 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index b946060b26fc..481032c701cb 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -16,7 +16,7 @@ MERGE_LIBRARY_LIST := \
configmgr \
cppcanvas \
$(call gb_Helper_optional,BREAKPAD,crashreport) \
- $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
+ dbtools \
deployment \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \