diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-06-01 07:40:12 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-06-01 20:04:56 +0200 |
| commit | ffc6d564b91692cd9d99a0eb3b1ceaf54f7db89e (patch) | |
| tree | 802161bbd2537009992ee519b3aefc59ee054ca8 /connectivity | |
| parent | 7cdf74b305be14825c615b2abe6ab8d79fe858ff (diff) | |
configure: Refactor disabling DB drivers
Disabling the DB connectivity is incomplete. We can't generally
disable it for the cross-toolset, because svx / gengal then fails
to build. But at least we can always disable most DB drivers in
these cases and just use --disable-database-connectivity in the
cross-toolset when building without galleries (which also gives
this flag some testing with the Android cross-toolset).
This also moves the DB modules in the registry generation target
into a common DBCONNECTIVITY block, to prevent build failures.
Change-Id: Ib98e1e8918cccc3caf9bc04185bac533509329a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116511
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/Module_connectivity.mk | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index a02ec9b7332f..b952594b0084 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif -ifneq ($(OS),WNT) - ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_macab \ @@ -59,14 +57,19 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif -endif - ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_ado \ Library_ado \ )) + +# "ADO is not available on 64bit" said the commit +ifeq ($(CPUNAME),INTEL) +$(eval $(call gb_Module_add_check_targets,connectivity,\ + CppunitTest_connectivity_ado \ +)) endif +endif # WNT ifeq ($(ENABLE_EVOAB2),TRUE) $(eval $(call gb_Module_add_targets,connectivity,\ @@ -107,15 +110,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\ endif -ifeq ($(OS),WNT) -# "ADO is not available on 64bit" said the commit -ifneq ($(CPUNAME),X86_64) -$(eval $(call gb_Module_add_check_targets,connectivity,\ - CppunitTest_connectivity_ado \ -)) -endif -endif - ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\ Jar_ConnectivityTools \ @@ -137,6 +131,6 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\ CppunitTest_connectivity_sharedresources \ )) -endif +endif # DBCONNECTIVITY # vim: set noet sw=4 ts=4: |