From a11f2cdae50fad22a2c42f86d132d828bb0df01b Mon Sep 17 00:00:00 2001 From: qiaozp <47812250+chivalryq@users.noreply.github.com> Date: Tue, 27 Dec 2022 15:45:45 +0800 Subject: [PATCH] Fix: dependency makefile variable error (#5234) Signed-off-by: Qiaozp Signed-off-by: Qiaozp --- makefiles/dependency.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/makefiles/dependency.mk b/makefiles/dependency.mk index bad10a05b..62a631945 100644 --- a/makefiles/dependency.mk +++ b/makefiles/dependency.mk @@ -1,13 +1,13 @@ GOLANGCILINT_VERSION ?= 1.49.0 -GOLANGCILINT := $(shell which golangci-lint) +GLOBAL_GOLANGCILINT := $(shell which golangci-lint) GOBIN_GOLANGCILINT:= $(shell which $(GOBIN)/golangci-lint) .PHONY: golangci golangci: -ifeq ($(shell $(GOLANGCILINT) version --format short), $(GOLANGCILINT_VERSION)) +ifeq ($(shell $(GLOBAL_GOLANGCILINT) version --format short), $(GOLANGCILINT_VERSION)) @$(OK) golangci-lint is already installed -GOLANGCILINT=$(GOLANGCILINT) +GOLANGCILINT=$(GLOBAL_GOLANGCILINT) else ifeq ($(shell $(GOBIN_GOLANGCILINT) version --format short), $(GOLANGCILINT_VERSION)) @$(OK) golangci-lint is already installed GOLANGCILINT=$(GOBIN_GOLANGCILINT)