diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-17 22:14:39 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-11 18:34:48 +0200 |
| commit | 63972e79bbb9ea9654e755381641052632b0402c (patch) | |
| tree | 090dd6dabcbd11b8aab77376736c3561c408ab6d /postprocess/CustomTarget_registry.mk | |
| parent | 114ed73a7ba56e013e6d7f886798915fb20c0946 (diff) | |
Fix the minimal build-tools target
The revert commits change the build-tools target for a DESKTOP
build to build the complete LO. This restores the original,
minimal one and also adds a whitelist of allowd build types.
OpenCL needs a configure switch, as it's status is also stored
in a config header, so preventing the build is not enough.
This also reverts:
- commit 802161a505272732566210e9ebbd8fe1b23fb86d
- commit 02d931a59e2966d0c2736db8dee7be3e3dcd6bae
Change-Id: Ibfcb0c54e72da1b7c2e63c082ea6586520a787fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102480
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'postprocess/CustomTarget_registry.mk')
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index c95794e1f508..97db3e6fbdce 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -312,15 +312,18 @@ postprocess_FILES_main += \ # VCL-unixdesktop.xcu must come after VCL.xcu else ifeq (WNT,$(OS)) postprocess_FILES_main += \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/ado)/org/openoffice/Office/DataAccess/Drivers-ado.xcu \ $(postprocess_MOD)/org/openoffice/Inet-wnt.xcu \ $(postprocess_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \ $(postprocess_MOD)/org/openoffice/Office/Common-wnt.xcu \ $(postprocess_MOD)/org/openoffice/Office/Paths-unxwnt.xcu \ $(postprocess_MOD)/org/openoffice/ucb/Configuration-win.xcu # Inet-wnt.xcu must come after Inet.xcu +ifeq ($(gb_Side),host) +postprocess_FILES_main += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/ado)/org/openoffice/Office/DataAccess/Drivers-ado.xcu postprocess_DRIVERS += ado endif +endif ifneq ($(WITH_WEBDAV),) postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-webdav.xcu endif |