Makefile: Also redirect stderr on which calls (#1068)

release/v1.15
silverwind 2017-02-26 14:12:21 +01:00 committed by Lunny Xiao
parent 35548a9d4e
commit 5bd22a2f4a
1 changed files with 4 additions and 4 deletions

View File

@ -47,21 +47,21 @@ vet:
.PHONY: generate .PHONY: generate
generate: generate:
@which go-bindata > /dev/null; if [ $$? -ne 0 ]; then \ @which go-bindata > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
go get -u github.com/jteeuwen/go-bindata/...; \ go get -u github.com/jteeuwen/go-bindata/...; \
fi fi
go generate $(PACKAGES) go generate $(PACKAGES)
.PHONY: errcheck .PHONY: errcheck
errcheck: errcheck:
@which errcheck > /dev/null; if [ $$? -ne 0 ]; then \ @which errcheck > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
go get -u github.com/kisielk/errcheck; \ go get -u github.com/kisielk/errcheck; \
fi fi
errcheck $(PACKAGES) errcheck $(PACKAGES)
.PHONY: lint .PHONY: lint
lint: lint:
@which golint > /dev/null; if [ $$? -ne 0 ]; then \ @which golint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
go get -u github.com/golang/lint/golint; \ go get -u github.com/golang/lint/golint; \
fi fi
for PKG in $(PACKAGES); do golint -set_exit_status $$PKG || exit 1; done; for PKG in $(PACKAGES); do golint -set_exit_status $$PKG || exit 1; done;
@ -105,7 +105,7 @@ release-dirs:
.PHONY: release-build .PHONY: release-build
release-build: release-build:
@which xgo > /dev/null; if [ $$? -ne 0 ]; then \ @which xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
go get -u github.com/karalabe/xgo; \ go get -u github.com/karalabe/xgo; \
fi fi
xgo -dest $(DIST)/binaries -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -targets '$(TARGETS)' -out $(EXECUTABLE)-$(VERSION) . xgo -dest $(DIST)/binaries -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -targets '$(TARGETS)' -out $(EXECUTABLE)-$(VERSION) .