From 6945aa34eb39e4ad8698dc1312fe72740b074a9f Mon Sep 17 00:00:00 2001 From: aerth Date: Wed, 12 Apr 2017 10:42:39 -0700 Subject: [PATCH] Use GOHOSTARCH/GOHOSTOS to get version, date, Resolves #620 For "install" target, get GOBIN using 'go env GOPATH' instead of $GOPATH because new Go doesn't require $GOPATH be set --- Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index fb72f323..bc2d123d 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,14 @@ .PHONY: runtime -VERSION = $(shell go run tools/build-version.go) -HASH = $(shell git rev-parse --short HEAD) -DATE = $(shell go run tools/build-date.go) -ADDITIONAL_GO_LINKER_FLAGS = $(shell go run tools/info-plist.go "$(VERSION)") - -GOBIN ?= $(GOPATH)/bin +VERSION := $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \ + go run tools/build-version.go) +HASH := $(shell git rev-parse --short HEAD) +DATE := $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \ + go run tools/build-date.go) +ADDITIONAL_GO_LINKER_FLAGS := $(shell GOOS=$(shell go env GOHOSTOS) \ + GOARCH=$(shell go env GOHOSTARCH) \ + go run tools/info-plist.go "$(VERSION)") +GOBIN ?= $(shell go env GOPATH)/bin # Builds micro after checking dependencies but without updating the runtime build: deps