mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-13 00:54:04 -08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #507 from prometheus/i686-build

Browse source 
Fix Go download path for i686 architecture.
This commit is contained in:
juliusv 2015-02-05 16:48:18 +01:00
parent 82613527f3 d9ff2f7edb
commit 0d6c958847
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

@ -27,7 +27,7 @@ MAC_OS_X_VERSION ?= 10.8
BUILD_PATH = $(PWD)/.build BUILD_PATH = $(PWD)/.build
GO_VERSION := 1.4 GO_VERSION := 1.4
GOOS = $(subst Darwin,darwin,$(subst Linux,linux,$(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)
@ -38,7 +38,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,$(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