From 3b54838ecaed8f34de0bad85c64718a8079812c3 Mon Sep 17 00:00:00 2001 From: Daniel Nelson Date: Tue, 30 Jun 2020 00:49:09 -0700 Subject: [PATCH] Only set version ldflags on tags --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8bb788476..a4022e916 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,12 @@ MAKEFLAGS += --no-print-directory GOOS ?= $(shell go env GOOS) GOARCH ?= $(shell go env GOARCH) HOSTGO := env -u GOOS -u GOARCH -u GOARM -- go -LDFLAGS := $(LDFLAGS) -X main.commit=$(commit) -X main.branch=$(branch) -X main.version=$(version) + +LDFLAGS := $(LDFLAGS) -X main.commit=$(commit) -X main.branch=$(branch) +ifneq ($(tag),) + LDFLAGS += -X main.version=$(version) +endif + GOFILES ?= $(shell git ls-files '*.go') GOFMT ?= $(shell gofmt -l -s $(filter-out plugins/parsers/influx/machine.go, $(GOFILES)))