From 696a50fd274c7ff6147aec50dde8f5206567ee7a Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Mon, 4 Jan 2016 16:27:53 +0000 Subject: [PATCH] Don't -i for different architectures. --- Makefile | 7 ++++--- circle.yml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index cae5adc2c..a2b9bcd6c 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,8 @@ RUNSVINIT=vendor/runsvinit/runsvinit RM=--rm RUN_FLAGS=-ti BUILD_IN_CONTAINER=true -GO_BUILD_FLAGS=-i -ldflags "-extldflags \"-static\" -X main.version=$(SCOPE_VERSION)" -tags netgo +GO_BUILD_INSTALL_DEPS=-i +GO_BUILD_FLAGS=$(GO_BUILD_INSTALL_DEPS) -ldflags "-extldflags \"-static\" -X main.version=$(SCOPE_VERSION)" -tags netgo all: $(SCOPE_EXPORT) @@ -44,12 +45,12 @@ $(SCOPE_EXE) $(RUNSVINIT): $(SCOPE_BACKEND_BUILD_UPTODATE) @mkdir -p $(shell pwd)/pkg $(SUDO) docker run $(RM) $(RUN_FLAGS) -v $(shell pwd):/go/src/github.com/weaveworks/scope -e GOARCH -e GOOS \ -v $(shell pwd)/pkg:/go/pkg \ - $(SCOPE_BACKEND_BUILD_IMAGE) SCOPE_VERSION=$(SCOPE_VERSION) $@ + $(SCOPE_BACKEND_BUILD_IMAGE) SCOPE_VERSION=$(SCOPE_VERSION) GO_BUILD_INSTALL_DEPS=$(GO_BUILD_INSTALL_DEPS) $@ shell: $(SUDO) docker run $(RM) $(RUN_FLAGS) -v $(shell pwd):/go/src/github.com/weaveworks/scope -e GOARCH -e GOOS \ -v $(shell pwd)/pkg:/go/pkg \ - $(SCOPE_BACKEND_BUILD_IMAGE) SCOPE_VERSION=$(SCOPE_VERSION) $@ + $(SCOPE_BACKEND_BUILD_IMAGE) SCOPE_VERSION=$(SCOPE_VERSION) GO_BUILD_INSTALL_DEPS=$(GO_BUILD_INSTALL_DEPS) $@ else $(SCOPE_EXE): time go build $(GO_BUILD_FLAGS) -o $@ ./$(@D) diff --git a/circle.yml b/circle.yml index a86a2c9ae..454421786 100644 --- a/circle.yml +++ b/circle.yml @@ -41,7 +41,7 @@ test: parallel: true - cd $SRCDIR; make RM= static: parallel: true - - cd $SRCDIR; rm -f prog/scope; if [ "$CIRCLE_NODE_INDEX" = "0" ]; then GOARCH=arm make RM= prog/scope; else GOOS=darwin make RM= prog/scope; fi: + - cd $SRCDIR; rm -f prog/scope; if [ "$CIRCLE_NODE_INDEX" = "0" ]; then GOARCH=arm make GO_BUILD_INSTALL_DEPS= RM= prog/scope; else GOOS=darwin make GO_BUILD_INSTALL_DEPS= RM= prog/scope; fi: parallel: true - cd $SRCDIR; rm -f prog/scope; make RM=: parallel: true