[v3.2.3-rhel] Fix attempt to use incompatible go tools

Change breaks on this branch which depends on an older toolchain:

https://cs.opensource.google/go/x/tools/+/master:internal/gocommand/invoke.go;bpv=1;bpt=0;drc=866a2000920cc5ae9d6650c27c4b14f4654938e7;dlc=5214f412aecffbca887fc0c26f8d59e3a2342d44

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2023-04-17 10:28:06 -04:00
parent 9388445116
commit 0ce9e4ab8c

View File

@ -748,13 +748,7 @@ install.systemd:
endif
.PHONY: install.tools
install.tools: .install.goimports .install.md2man .install.ginkgo .install.golangci-lint .install.bats ## Install needed tools
.install.goimports: .gopathok
if [ ! -x "$(GOBIN)/goimports" ]; then \
$(call go-get,golang.org/x/tools/cmd/goimports); \
fi
touch .install.goimports
install.tools: .install.md2man .install.ginkgo .install.golangci-lint .install.bats ## Install needed tools
.PHONY: .install.ginkgo
.install.ginkgo: .gopathok
@ -829,6 +823,5 @@ clean: ## Clean all make artifacts
libpod/pod_ffjson.go \
libpod/container_easyjson.go \
libpod/pod_easyjson.go \
.install.goimports \
docs/build
make -C docs clean