From 12324e35501a57868bc2cf19670dea0fb57af54a Mon Sep 17 00:00:00 2001 From: David Wragg Date: Fri, 11 Sep 2015 13:31:15 +0100 Subject: [PATCH] Revert "Make weave build under go1.5; use our build flags for go get, and force stuff to be static." This reverts commit 5860492a38d62801c38800282125202525aad870. Although the build works under 1.4, this change had an unfortunate impact (see #1412). --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e62d2745..cbbd0f83 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ NETGO_CHECK=@strings $@ | grep cgo_stub\\\.go >/dev/null || { \ echo " sudo go install -tags netgo std"; \ false; \ } -BUILD_FLAGS=-ldflags "-extldflags \"-static\" -linkmode=external -X main.version=$(WEAVE_VERSION)" -tags netgo +BUILD_FLAGS=-ldflags "-extldflags \"-static\" -X main.version $(WEAVE_VERSION)" -tags netgo all: $(WEAVE_EXPORT) $(COVER_EXE) $(RUNNER_EXE) @@ -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 -tags netgo ./$(@D) - go build $(BUILD_FLAGS) -o $@ ./$(@D) + go get ./$(@D) + go build -o $@ ./$(@D) $(WEAVER_UPTODATE): prog/weaver/Dockerfile $(WEAVER_EXE) $(SUDO) docker build -t $(WEAVER_IMAGE) prog/weaver