From 43f6cf711457d5533c416d2180b6be4f3bfae188 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Tue, 3 Nov 2015 14:11:36 +0000 Subject: [PATCH] Fix build warning with go1.5 --- Makefile | 4 ++-- backend/build.sh | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b3e91cea7..a08fb5ec1 100644 --- a/Makefile +++ b/Makefile @@ -46,8 +46,8 @@ $(APP_EXE) $(PROBE_EXE) $(RUNSVINIT): $(SCOPE_BACKEND_BUILD_UPTODATE) $(SUDO) docker run $(RM) -v $(shell pwd):/go/src/github.com/weaveworks/scope -e GOARCH -e GOOS \ $(SCOPE_BACKEND_BUILD_IMAGE) SCOPE_VERSION=$(SCOPE_VERSION) $@ else -$(APP_EXE) $(PROBE_EXE): - go build -ldflags "-extldflags \"-static\" -X main.version $(SCOPE_VERSION)" -tags netgo -o $@ ./$(@D) +$(APP_EXE) $(PROBE_EXE): $(SCOPE_BACKEND_BUILD_UPTODATE) + go build -ldflags "-extldflags \"-static\" -X main.version=$(SCOPE_VERSION)" -tags netgo -o $@ ./$(@D) @strings $@ | grep cgo_stub\\\.go >/dev/null || { \ rm $@; \ echo "\nYour go standard library was built without the 'netgo' build tag."; \ diff --git a/backend/build.sh b/backend/build.sh index 81448d550..e1402a18a 100755 --- a/backend/build.sh +++ b/backend/build.sh @@ -6,6 +6,5 @@ set -eux # -v $(pwd):/go/src/github.com/weaveworks/scope cd $GOPATH/src/github.com/weaveworks/scope -rm $1 2>/dev/null || true make BUILD_IN_CONTAINER=false $@