diff options
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | external/Module_external.mk | 7 | ||||
| -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 |
5 files changed, 9 insertions, 9 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 \ 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: 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: |