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 /solenv | |
| 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 'solenv')
| -rw-r--r-- | solenv/gbuild/Helper.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/Module.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_BuildTools.mk | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 4e914d16cc67..c3677c011f63 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -299,7 +299,9 @@ endef endif define gb_Helper_optional_for_host -$(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2)) +$(if $(filter build,$(gb_Side)), \ + $(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2)), \ + $(call gb_Output_error,gb_Helper_optional_for_host: Use only when gb_Side=build)) endef define gb_Helper_print_on_error diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index eb558a8033ac..6af2b5c6f72c 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -144,10 +144,12 @@ $(call gb_Module_get_target,%) : all : build $(if $(CROSS_COMPILING),,unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck)) +ifeq ($(gb_Side),build) build-tools : $(gb_BUILD_TOOLS) $(call gb_Output_announce,loaded tools: $(gb_BUILD_TOOLS),$(true),ALL,6) $(call gb_Output_announce_title,build-tools done.) $(call gb_Output_announce_bell) +endif build : $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),ALL,6) diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk index f387df6cf9fa..5daf671e082b 100644 --- a/solenv/gbuild/extensions/pre_BuildTools.mk +++ b/solenv/gbuild/extensions/pre_BuildTools.mk @@ -8,6 +8,7 @@ # # Tools we need to build for cross-compiling +ifeq ($(gb_Side),build) gb_BUILD_TOOLS = \ $(foreach executable, \ bestreversemap \ @@ -44,4 +45,6 @@ gb_BUILD_TOOLS = \ ,$(call gb_ExternalExecutable_get_dependencies,$(executable))) \ $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \ +endif + # vim: set noet sw=4 ts=4: |