diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-12-04 12:12:01 -0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-24 09:12:16 +0000 |
| commit | 692c724f5e71f685c269085983828e7539274ecb (patch) | |
| tree | 6537a43ac630470fda9ec55ac0301d66022af9fa /solenv | |
| parent | 8a6d84fc1a926147884a9cbf234f86c6fb6f8583 (diff) | |
fdo#60698: Merge odbcbase into odbc
We odbcbase is just used inside odbc library, so merge them.
Change-Id: I4f4b34873b570ddcf1065c49e5310a1e73092fd6
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 11628ef96402..9cc207915e11 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -69,7 +69,6 @@ gb_EXTRAMERGEDLIBS := \ $(if $(filter-out WNT,$(OS)),$(call gb_Helper_optional,DBCONNECTIVITY,mork)) \ $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \ $(if $(filter-out ANDROID IOS,$(OS)),odbc) \ - $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \ odfflatxml \ offacc \ oox \ |