RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #929 from prometheus/override-arch 

Allow overriding GOARCH and GOOS in Makefile.INCLUDE.
This commit is contained in:
Julius Volz 2015-07-27 11:45:52 +02:00
parent a48ce1edb7 5a58e876c3
commit beae7b6afb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.INCLUDE
View File

@ -31,7 +31,7 @@ MAKEFILE_DIR ?= $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
BUILD_PATH = $(MAKEFILE_DIR)/.build BUILD_PATH = $(MAKEFILE_DIR)/.build
GO_VERSION := 1.4.2 GO_VERSION := 1.4.2
GOOS = $(subst Darwin,darwin,$(subst Linux,linux,$(subst FreeBSD,freebsd,$(OS)))) GOOS ?= $(subst Darwin,darwin,$(subst Linux,linux,$(subst FreeBSD,freebsd,$(OS))))
ifeq ($(GOOS),darwin) ifeq ($(GOOS),darwin)
RELEASE_SUFFIX ?= -osx$(MAC_OS_X_VERSION) RELEASE_SUFFIX ?= -osx$(MAC_OS_X_VERSION)
@ -42,7 +42,7 @@ endif
# Never honor GOBIN, should it be set at all. # Never honor GOBIN, should it be set at all.
unexport GOBIN unexport GOBIN
GOARCH = $(subst x86_64,amd64,$(patsubst i%86,386,$(ARCH))) GOARCH ?= $(subst x86_64,amd64,$(patsubst i%86,386,$(ARCH)))
GOPKG ?= go$(GO_VERSION).$(GOOS)-$(GOARCH)$(RELEASE_SUFFIX).tar.gz GOPKG ?= go$(GO_VERSION).$(GOOS)-$(GOARCH)$(RELEASE_SUFFIX).tar.gz
GOURL ?= https://golang.org/dl GOURL ?= https://golang.org/dl
GOROOT = $(BUILD_PATH)/root/go GOROOT = $(BUILD_PATH)/root/go