From 985e93ecb44aef97995099d4fd5915afd3cab282 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 1 Dec 2016 07:35:26 +0100 Subject: fix cross-toolset: gb_Helper_optional_for_host can't contain 'newline' Otherwise, the 'newline' is passed as a second parameter to gb_Module_add_moduledir which breaks build. :/ Change-Id: I02eba5ddef9f7a6dccbb7d135a7e8c68629da9c4 --- solenv/gbuild/Helper.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'solenv/gbuild/Helper.mk') diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 1464411be403..c3677c011f63 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -299,8 +299,9 @@ endef endif define gb_Helper_optional_for_host -$(if $(filter build,$(gb_Side)),,$(call gb_Output_error,gb_Helper_optional_for_host: Use only when gb_Side=build)) -$(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 -- cgit