diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-01 07:35:26 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-01 07:46:56 +0100 |
| commit | 985e93ecb44aef97995099d4fd5915afd3cab282 (patch) | |
| tree | 07dcce36d2f3fee5f42b54499e96d1de55aa5b5a /solenv | |
| parent | c5bc7820482c9dc69fcbd54d8c3a8c0ed27c8d30 (diff) | |
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
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Helper.mk | 5 |
1 files changed, 3 insertions, 2 deletions
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 |