From 7a7ab869185cdff9a2ef862adf76198ebba7dcb1 Mon Sep 17 00:00:00 2001 From: Valters Jansons Date: Mon, 20 Feb 2023 12:07:23 +0200 Subject: [PATCH] Consistently generate build tags on newer Make (#2018) With Make 4.3+, the empty whitespace does not seem to work as originally intended. This causes build tags to be "netgo ledger," on Ubuntu 22.04 and other systems that include the newer Make version. The build tags were intended as "netgo,ledger" which can be observed on Make 4.2 (shipped with Ubuntu 20.04). This change swaps out the `+=` use in favor of an explicit `:=`. Ref: https://www.gnu.org/software/make/manual/html_node/Appending.html Closes cosmos/gaia#2017. Co-authored-by: Marius Poke Co-authored-by: Milan Mulji <98309852+mmulji-ic@users.noreply.github.com> (cherry picked from commit 297cdb95709fdf534ce148d49dea4d7bda1f7173) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 46967152919..09748e5908a 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ build_tags += $(BUILD_TAGS) build_tags := $(strip $(build_tags)) whitespace := -whitespace += $(whitespace) +whitespace := $(whitespace) $(whitespace) comma := , build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags))