From abba6cfb655a1ed66ccdcbe17d8aabc4622be92c Mon Sep 17 00:00:00 2001
From: Simon Howe <footless@gmail.com>
Date: Tue, 2 Feb 2016 13:01:12 +0100
Subject: [PATCH 1/2] Fixes building scope outside of a container.

---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index a2759992d2..29ac75628d 100644
--- a/Makefile
+++ b/Makefile
@@ -54,6 +54,9 @@ $(SCOPE_EXE) $(RUNSVINIT) lint tests shell: $(SCOPE_BACKEND_BUILD_UPTODATE)
 
 else
 
+# This is set in backend/Dockerfile when building inside a container.
+export GO15VENDOREXPERIMENT=1
+
 $(SCOPE_EXE): $(SCOPE_BACKEND_BUILD_UPTODATE)
 	time go build $(GO_BUILD_FLAGS) -o $@ ./$(@D)
 	@strings $@ | grep cgo_stub\\\.go >/dev/null || { \

From 9b7bd64f955c1b0e0ff9dca0c23749f8c496ecd3 Mon Sep 17 00:00:00 2001
From: Simon Howe <footless@gmail.com>
Date: Thu, 11 Feb 2016 23:04:34 +0700
Subject: [PATCH 2/2] Don't use make's export directive for
 GO15VENDOREXPERIMENT

---
 Makefile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 29ac75628d..b988c4af9a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ RUNSVINIT=vendor/runsvinit/runsvinit
 RM=--rm
 RUN_FLAGS=-ti
 BUILD_IN_CONTAINER=true
+GO ?= env GO15VENDOREXPERIMENT=1 go
 GO_BUILD_INSTALL_DEPS=-i
 GO_BUILD_FLAGS=$(GO_BUILD_INSTALL_DEPS) -ldflags "-extldflags \"-static\" -X main.version=$(SCOPE_VERSION)" -tags netgo
 
@@ -54,11 +55,8 @@ $(SCOPE_EXE) $(RUNSVINIT) lint tests shell: $(SCOPE_BACKEND_BUILD_UPTODATE)
 
 else
 
-# This is set in backend/Dockerfile when building inside a container.
-export GO15VENDOREXPERIMENT=1
-
 $(SCOPE_EXE): $(SCOPE_BACKEND_BUILD_UPTODATE)
-	time go build $(GO_BUILD_FLAGS) -o $@ ./$(@D)
+	time $(GO) build $(GO_BUILD_FLAGS) -o $@ ./$(@D)
 	@strings $@ | grep cgo_stub\\\.go >/dev/null || { \
 	        rm $@; \
 	        echo "\nYour go standard library was built without the 'netgo' build tag."; \
@@ -69,7 +67,7 @@ $(SCOPE_EXE): $(SCOPE_BACKEND_BUILD_UPTODATE)
 	    }
 
 $(RUNSVINIT):
-	time go build $(GO_BUILD_FLAGS) -o $@ ./$(@D)
+	time $(GO) build $(GO_BUILD_FLAGS) -o $@ ./$(@D)
 
 shell:
 	/bin/bash
@@ -122,13 +120,13 @@ $(SCOPE_BACKEND_BUILD_UPTODATE): backend/*
 	touch $@
 
 clean:
-	go clean ./...
+	$(GO) clean ./...
 	$(SUDO) docker rmi $(SCOPE_UI_BUILD_IMAGE) $(SCOPE_BACKEND_BUILD_IMAGE) >/dev/null 2>&1 || true
 	rm -rf $(SCOPE_EXPORT) $(SCOPE_UI_BUILD_UPTODATE) $(SCOPE_BACKEND_BUILD_UPTODATE) \
 		$(SCOPE_EXE) $(RUNSVINIT) prog/static.go client/build/app.js docker/weave .pkg
 
 deps:
-	go get -u -f -tags netgo \
+	$(GO) get -u -f -tags netgo \
 		github.com/FiloSottile/gvt \
 		github.com/mattn/goveralls \
 		github.com/mjibson/esc \