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 /Repository.mk | |
| 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 'Repository.mk')
| -rw-r--r-- | Repository.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index 48ce9340b739..8030cf543f9d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -918,7 +918,7 @@ $(eval $(call gb_Helper_register_resources,\ eur \ for \ forui \ - $(call gb_Helper_optional_for_host,DESKTOP,fps_office) \ + $(call gb_Helper_optional,DESKTOP,fps_office) \ frm \ fwe \ gal \ |