From c0b63ef3f7fa275461c2c7a103afd277cd76521d Mon Sep 17 00:00:00 2001
From: "R.B. Boyer" <4903+rboyer@users.noreply.github.com>
Date: Wed, 26 May 2021 16:40:15 -0500
Subject: [PATCH] build: ensure each tool is built separately (#10303)

---
 GNUmakefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 1d21164677..7e714b24e0 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -315,10 +315,12 @@ ui: ui-docker static-assets-docker
 
 tools:
 	@mkdir -p .gotools
-	@cd .gotools && if [[ ! -f go.mod ]]; then \
+	@cd .gotools && for TOOL in $(GOTOOLS); do \
+		echo "=== TOOL: $$TOOL" ; \
+		rm -f go.mod go.sum ; \
 		go mod init consul-tools ; \
-	fi
-	cd .gotools && go get -v $(GOTOOLS)
+		go get -v $$TOOL ; \
+	done
 
 version:
 	@echo -n "Version:                    "