From b4299090c3e503ba0c49a6086b1a46c218ca45f4 Mon Sep 17 00:00:00 2001 From: "Joe Richey joerichey@google.com" Date: Thu, 12 Oct 2017 17:59:45 -0700 Subject: Command, Context, command line splitting setup --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index eb57d09..570936b 100644 --- a/Makefile +++ b/Makefile @@ -87,10 +87,10 @@ GO_LINK_FLAGS ?= -s -w # Pass the version to the command line program (pulled from tags). TAG_VERSION = $(shell git describe --tags) VERSION = $(if $(TAG_VERSION),$(TAG_VERSION),$(RELEASE_VERSION)) -VERSION_FLAG = -X "main.version=$(VERSION)" +VERSION_FLAG = -X "$(PKG_DIR)/cmd.VersionTag=$(VERSION)" # Pass the current date and time to the command line program. -DATE_FLAG = -X "main.buildTime=$(shell date)" +DATE_FLAG = -X "$(PKG_DIR)/cmd.BuildTimeTag=$(shell date)" # Add the version, date, and any specified LDFLAGS to any user-specified flags. override GO_LINK_FLAGS += $(VERSION_FLAG) $(DATE_FLAG) -extldflags "$(LDFLAGS)" # Add the link flags to any user-specified flags. -- cgit v1.3