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 /RepositoryExternal.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 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2aa145698410..d9fa980d7f24 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3878,7 +3878,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(if $(filter MACOSX,$(OS)),$(call gb_Library_get_target,vclplug_osx)) \ $(if $(filter WNT,$(OS)),$(call gb_Library_get_target,vclplug_win)) \ - $(call gb_Package_get_target_for_build,postprocess_images) \ + $(if $(filter host,$(gb_Side)),$(call gb_Package_get_target,postprocess_images)) \ $(call gb_Package_get_target_for_build,postprocess_registry) \ $(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \ $(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,fundamental) \ |