From a59ae61441f86c4e30f0016a371b1e8e14d7b0d5 Mon Sep 17 00:00:00 2001 From: mmetc <92726601+mmetc@users.noreply.github.com> Date: Thu, 11 Jan 2024 09:25:33 +0100 Subject: [PATCH] Makefile: use GO macro if set, to check for version (#2706) --- mk/goversion.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/goversion.mk b/mk/goversion.mk index dd9954928..73e9a72e2 100644 --- a/mk/goversion.mk +++ b/mk/goversion.mk @@ -1,5 +1,5 @@ -BUILD_GOVERSION = $(subst go,,$(shell go env GOVERSION)) +BUILD_GOVERSION = $(subst go,,$(shell $(GO) env GOVERSION)) go_major_minor = $(subst ., ,$(BUILD_GOVERSION)) GO_MAJOR_VERSION = $(word 1, $(go_major_minor)) @@ -9,7 +9,7 @@ GO_VERSION_VALIDATION_ERR_MSG = Golang version ($(BUILD_GOVERSION)) is not suppo .PHONY: goversion -goversion: $(if $(findstring devel,$(shell go env GOVERSION)),goversion_devel,goversion_check) +goversion: $(if $(findstring devel,$(shell $(GO) env GOVERSION)),goversion_devel,goversion_check) .PHONY: goversion_devel