diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2016-11-30 14:36:51 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-12-01 11:08:43 +0000 |
| commit | c3bec2919fda97f37127c3656314a1441f19ce5a (patch) | |
| tree | 2af5544b12553117f6ea62f2415f84c161a1ddd0 /external | |
| parent | 75627b4dc1a821142419ed50d247c2d0e621c78b (diff) | |
gbuild: Prevent wrong use of gb_Helper_optional_for_host
It's empty, unless gb_Side=build.
This fixes commit 1193443b15b0e38cbfb41573b31acf9a8d90ce2c
which removed icons used in our open dialog from image zip files.
Also, include 985e93ecb44aef97995099d4fd5915afd3cab282
"fix cross-toolset: gb_Helper_optional_for_host can't contain 'newline'"
Reviewed-on: https://gerrit.libreoffice.org/31419
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 52d409f0d657f314a53f945c9ffb5b8025bea034)
Change-Id: I83efad36d8f40c460d09ee1bd1addd7fb26c177b
Reviewed-on: https://gerrit.libreoffice.org/31463
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/Module_external.mk | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk index 3b54b52ade88..1dbf97b13265 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -101,13 +101,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,XSLTML,xsltml) \ $(call gb_Helper_optional,ZLIB,zlib) \ $(call gb_Helper_optional,ZMF,libzmf) \ - $(call gb_Helper_optional_for_host,DESKTOP, \ - $(if $(WITH_GALLERY_BUILD), \ - $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ - $(call gb_Helper_optional,LCMS2,lcms2) \ - $(call gb_Helper_optional,NSS,nss) \ - ) \ - ) \ )) # vim: set noet sw=4 ts=4: |