Merge pull request #105 from eripa/go15

Changed Go version to 1.5.1
This commit is contained in:
Julius Volz 2015-09-10 00:31:20 +02:00
commit c53fd5521e
2 changed files with 2 additions and 2 deletions

View File

@ -13,6 +13,6 @@
VERSION := 0.11.0 VERSION := 0.11.0
TARGET := node_exporter TARGET := node_exporter
GOFLAGS := -ldflags "-X main.Version $(VERSION)" GOFLAGS := -ldflags "-X main.Version=$(VERSION)"
include Makefile.COMMON include Makefile.COMMON

View File

@ -48,7 +48,7 @@ ifeq ($(GOOS),darwin)
RELEASE_SUFFIX ?= -osx$(shell sw_vers -productVersion) RELEASE_SUFFIX ?= -osx$(shell sw_vers -productVersion)
endif endif
GO_VERSION ?= 1.4.2 GO_VERSION ?= 1.5.1
GOURL ?= https://golang.org/dl GOURL ?= https://golang.org/dl
GOPKG ?= go$(GO_VERSION).$(GOOS)-$(GOARCH)$(RELEASE_SUFFIX).tar.gz GOPKG ?= go$(GO_VERSION).$(GOOS)-$(GOARCH)$(RELEASE_SUFFIX).tar.gz
GOPATH := $(CURDIR)/.build/gopath GOPATH := $(CURDIR)/.build/gopath