From e759e5719be1d602a18aae55991e0354eb460f78 Mon Sep 17 00:00:00 2001
From: Julius Volz <julius.volz@gmail.com>
Date: Sat, 28 Mar 2015 01:14:55 +0100
Subject: [PATCH] Update Makefile.COMMON

---
 Makefile.COMMON | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile.COMMON b/Makefile.COMMON
index d229cb39..86e2e05d 100644
--- a/Makefile.COMMON
+++ b/Makefile.COMMON
@@ -41,20 +41,14 @@ VERSION ?= $(error VERSION not set in including Makefile)
 TARGET  ?= $(error TARGET not set in including Makefile)
 
 SRC    ?= $(shell find . -type f -name "*.go" ! -path "./.build/*")
-GOOS   := $(shell uname | tr A-Z a-z)
-GOARCH := $(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m)))
+GOOS   ?= $(shell uname | tr A-Z a-z)
+GOARCH ?= $(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m)))
 
 ifeq ($(GOOS),darwin)
 	RELEASE_SUFFIX ?= -osx$(shell sw_vers -productVersion)
 endif
 
 GO_VERSION ?= 1.4.2
-GOURL      ?= https://golang.org/dl
-GOPKG      ?= go$(GO_VERSION).$(GOOS)-$(GOARCH)$(RELEASE_SUFFIX).tar.gz
-GOPATH     := $(CURDIR)/.build/gopath
-GOCC       ?= $(GOROOT)/bin/go
-GO         ?= GOROOT=$(GOROOT) GOPATH=$(GOPATH) $(GOCC)
-GOFMT      ?= $(GOROOT)/bin/gofmt
 
 ifeq ($(shell type go >/dev/null && go version | sed 's/.*go\([0-9.]*\).*/\1/'), $(GO_VERSION))
 	GOROOT := $(shell go env GOROOT)
@@ -62,6 +56,13 @@ else
 	GOROOT := $(CURDIR)/.build/go$(GO_VERSION)
 endif
 
+GOURL      ?= https://golang.org/dl
+GOPKG      ?= go$(GO_VERSION).$(GOOS)-$(GOARCH)$(RELEASE_SUFFIX).tar.gz
+GOPATH     := $(CURDIR)/.build/gopath
+GOCC       ?= $(GOROOT)/bin/go
+GO         ?= GOROOT=$(GOROOT) GOPATH=$(GOPATH) $(GOCC)
+GOFMT      ?= $(GOROOT)/bin/gofmt
+
 # Never honor GOBIN, should it be set at all.
 unexport GOBIN