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 /RepositoryModule_build.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 'RepositoryModule_build.mk')
| -rw-r--r-- | RepositoryModule_build.mk | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 9537ccd1d770..34322743197e 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -55,6 +55,41 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ unotools \ ure \ xmlreader \ + $(call gb_Helper_optional_for_host,DESKTOP, \ + $(if $(WITH_GALLERY_BUILD), \ + avmedia \ + basic \ + canvas \ + configmgr \ + connectivity \ + cppcanvas \ + drawinglayer \ + editeng \ + emfio \ + filter \ + framework \ + linguistic \ + officecfg \ + package \ + postprocess \ + sfx2 \ + shell \ + sot \ + svgio \ + svl \ + svtools \ + svx \ + toolkit \ + ucb \ + unoxml \ + uui \ + vcl \ + xmloff \ + xmlscript \ + ) \ + helpcompiler \ + xmlhelp \ + ) \ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ )) |