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 /shell | |
| 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 'shell')
| -rw-r--r-- | shell/Module_shell.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index a223aae617e0..e6d66355c27e 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -9,6 +9,14 @@ $(eval $(call gb_Module_Module,shell)) +ifeq ($(filter DESKTOP,$(BUILD_TYPE)),DESKTOP) +$(eval $(call gb_Module_add_targets,shell,\ + Executable_lngconvex \ +)) +endif + +ifeq ($(gb_Side),host) + $(eval $(call gb_Module_add_targets,shell,\ $(if $(filter-out MACOSX WNT,$(OS)),Library_desktopbe) \ Library_localebe \ @@ -99,7 +107,6 @@ endif ifeq ($(filter DESKTOP,$(BUILD_TYPE)),DESKTOP) $(eval $(call gb_Module_add_targets,shell,\ - Executable_lngconvex \ Library_syssh \ )) @@ -120,4 +127,6 @@ $(eval $(call gb_Module_add_l10n_targets,shell,\ AllLangMoTarget_shell \ )) +endif # $(gb_Side) == host + # vim: set shiftwidth=4 tabstop=4 noexpandtab: |