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 /vcl/Library_vcl.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 'vcl/Library_vcl.mk')
| -rw-r--r-- | vcl/Library_vcl.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 214c66b14197..3570b4091d7d 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -725,8 +725,11 @@ $(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc)) # HACK: dependency on icon themes so running unit tests don't # prevent delivering these by having open file handles on WNT +ifeq ($(gb_Side),host) $(eval $(call gb_Library_use_package,vcl,postprocess_images)) endif +endif # $(OS) == WNT + ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) ifeq ($(USING_X11),TRUE) |