re
/
client_golang
forked from mirror/client_golang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67 from prometheus/arch-os-build-fixes 

Fix Go download link for several archs and OSes.
This commit is contained in:
juliusv 2015-02-05 18:14:57 +01:00
parent 3823272e90 ecf2329b22
commit 52186fc518
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -21,7 +21,7 @@ MAC_OS_X_VERSION ?= 10.8
BUILD_PATH = $(PWD)/.build BUILD_PATH = $(PWD)/.build
export GO_VERSION = 1.4 export GO_VERSION = 1.4
export GOOS = $(subst Darwin,darwin,$(subst Linux,linux,$(OS))) export 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)
@ -32,9 +32,9 @@ endif
# Never honor GOBIN, should it be set at all. # Never honor GOBIN, should it be set at all.
unexport GOBIN unexport GOBIN
export GOARCH = $(subst x86_64,amd64,$(ARCH)) export GOARCH = $(subst x86_64,amd64,$(patsubst i%86,386,$(ARCH)))
export GOPKG = go$(GO_VERSION).$(GOOS)-$(GOARCH)$(RELEASE_SUFFIX).tar.gz export GOPKG = go$(GO_VERSION).$(GOOS)-$(GOARCH)$(RELEASE_SUFFIX).tar.gz
export GOURL = http://golang.org/dl export GOURL = https://golang.org/dl
export GOROOT = $(BUILD_PATH)/root/go export GOROOT = $(BUILD_PATH)/root/go
export GOPATH = $(BUILD_PATH)/root/gopath export GOPATH = $(BUILD_PATH)/root/gopath
export GOCC = $(GOROOT)/bin/go export GOCC = $(GOROOT)/bin/go