From 6d800c1eed8529cb209ec0c10bbe3b0a22fa6dc5 Mon Sep 17 00:00:00 2001 From: Valters Jansons Date: Sun, 5 Mar 2023 21:01:33 +0200 Subject: [PATCH] Consistently generate build tags on Make 4.3+ 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 Upstream: https://github.com/cosmos/gaia/commit/297cdb95709fdf534ce148d49dea4d7bda1f7173 --- module/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/Makefile b/module/Makefile index a3bd72617..3082bccea 100644 --- a/module/Makefile +++ b/module/Makefile @@ -39,7 +39,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))