From 753113f21a827e437bd34e3f3ee276df156f972a Mon Sep 17 00:00:00 2001 From: Julius Volz Date: Thu, 5 Feb 2015 16:03:45 +0100 Subject: [PATCH 1/2] Fix Go download path for x86-based architectures. This fixes https://github.com/prometheus/prometheus/issues/503. --- Makefile.INCLUDE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.INCLUDE b/Makefile.INCLUDE index bd347a4c5..e313e4555 100644 --- a/Makefile.INCLUDE +++ b/Makefile.INCLUDE @@ -38,7 +38,7 @@ endif # Never honor GOBIN, should it be set at all. 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 GOURL ?= https://golang.org/dl GOROOT = $(BUILD_PATH)/root/go From d9ff2f7edba652a6d68b7175b4b8eeb0509bedc5 Mon Sep 17 00:00:00 2001 From: Julius Volz Date: Thu, 5 Feb 2015 16:03:49 +0100 Subject: [PATCH 2/2] Fix Go download path for FreeBSD. --- Makefile.INCLUDE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.INCLUDE b/Makefile.INCLUDE index e313e4555..02c6f476b 100644 --- a/Makefile.INCLUDE +++ b/Makefile.INCLUDE @@ -27,7 +27,7 @@ MAC_OS_X_VERSION ?= 10.8 BUILD_PATH = $(PWD)/.build 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) RELEASE_SUFFIX ?= -osx$(MAC_OS_X_VERSION)