From 6edd4305388be40cfec5b56f28ab31284ee67636 Mon Sep 17 00:00:00 2001 From: David Wragg Date: Sun, 20 Sep 2015 19:58:04 +0100 Subject: [PATCH] Use consistent options for all "go get"/"go build" invocations Without this, building with go-1.5 fails with go get ./prog/weavewait go install net: open /usr/local/go/pkg/linux_amd64/net.a: permission denied This makes the options passed too "go get"/"go build" consistent for all executables. So it should be safe with go-1.4. Conflicts: Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 28d0fcd69a..fd1d2d9f11 100644 --- a/Makefile +++ b/Makefile @@ -81,8 +81,8 @@ $(COVER_EXE): testing/cover/cover.go $(RUNNER_EXE): testing/runner/runner.go $(WEAVEWAIT_EXE) $(SIGPROXY_EXE) $(WEAVEHOSTS_EXE) $(COVER_EXE) $(RUNNER_EXE): - go get ./$(@D) - go build -o $@ ./$(@D) + go get -tags netgo ./$(@D) + go build $(BUILD_FLAGS) -o $@ ./$(@D) $(WEAVER_UPTODATE): prog/weaver/Dockerfile $(WEAVER_EXE) $(SUDO) docker build -t $(WEAVER_IMAGE) prog/weaver