github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-25 08:16:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build warning with go1.5

Browse Source
This commit is contained in:
Tom Wilkie
2015-11-03 14:11:36 +00:00
parent bcd346ab5b
commit 43f6cf7114
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -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."; \

1
backend/build.sh
View File

@@ -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 $@