From 774bb2751c3924e02c1e9b6d09b1c44342747fcb Mon Sep 17 00:00:00 2001 From: Tobias Schottdorf Date: Mon, 21 Sep 2015 05:03:02 -0400 Subject: [PATCH 1/2] delete .bootstrap on `make clean` otherwise, `make clean build && go generate ./...` results in: make: *** No rule to make target `../../../bin/protoc', needed by `cockroach/config/config.pb.go'. Stop. main.go:20: running "make": exit status 2 make: Nothing to be done for `all'. rm -f ./embedded_debug.go and an explicit `glock sync` is needed." --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b3ba84f0f732..6c8b40ff53f1 100644 --- a/Makefile +++ b/Makefile @@ -148,7 +148,7 @@ check: clean: $(GO) clean -tags '$(TAGS)' $(GOFLAGS) -i github.com/cockroachdb/... find . -name '*.test' -type f -exec rm -f {} \; - rm -rf build/deploy/build + rm -rf build/deploy/build .bootstrap ifneq ($(SKIP_BOOTSTRAP),1) From 795776801a255d54d6c986bb7b181639f4a5e54e Mon Sep 17 00:00:00 2001 From: Tobias Schottdorf Date: Mon, 21 Sep 2015 08:05:21 -0400 Subject: [PATCH 2/2] remove obsolete refs to build/deploy/build --- .dockerignore | 1 - Makefile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 4b3b1edeed52..99de7ad87818 100644 --- a/.dockerignore +++ b/.dockerignore @@ -9,5 +9,4 @@ cockroach */*/*/*.test client/client_bench_* storage/engine/mvcc_scan_* -build/deploy/build certs diff --git a/Makefile b/Makefile index 6c8b40ff53f1..b6a70fac5487 100644 --- a/Makefile +++ b/Makefile @@ -148,7 +148,7 @@ check: clean: $(GO) clean -tags '$(TAGS)' $(GOFLAGS) -i github.com/cockroachdb/... find . -name '*.test' -type f -exec rm -f {} \; - rm -rf build/deploy/build .bootstrap + rm -f .bootstrap ifneq ($(SKIP_BOOTSTRAP),1)