Merge pull request #22236 from benesch/make-undefined

Makefile: fix broken master build

Makefile

@@ -336,6 +336,11 @@ BOOTSTRAP_TARGET := bin/.bootstrap
 
 SUBMODULES_TARGET := bin/.submodules-initialized
 
+GO_PROTOS_TARGET := bin/.go_protobuf_sources
+GW_PROTOS_TARGET := bin/.gw_protobuf_sources
+CPP_PROTOS_TARGET := bin/.cpp_protobuf_sources
+CPP_PROTOS_CCL_TARGET := bin/.cpp_ccl_protobuf_sources
+
 # Update the git hooks and install commands from dependencies whenever they
 # change.
 $(BOOTSTRAP_TARGET): $(GITHOOKS) Gopkg.lock bin/returncheck | $(SUBMODULES_TARGET)
@@ -684,11 +689,6 @@ SQLPARSER_TARGETS = \
 
 DOCGEN_TARGETS := bin/.docgen_bnfs bin/.docgen_functions
 
-GO_PROTOS_TARGET := bin/.go_protobuf_sources
-GW_PROTOS_TARGET := bin/.gw_protobuf_sources
-CPP_PROTOS_TARGET := bin/.cpp_protobuf_sources
-CPP_PROTOS_CCL_TARGET := bin/.cpp_ccl_protobuf_sources
-
 .DEFAULT_GOAL := all
 all: $(COCKROACH)
 
@@ -987,14 +987,14 @@ $(GW_PROTOS_TARGET): $(PROTOC) $(GW_SERVER_PROTOS) $(GW_TS_PROTOS) $(GO_PROTOS)
 	touch $@
 
 $(CPP_PROTOS_TARGET): $(PROTOC) $(CPP_PROTOS)
-	$(FIND_RELEVANT) -type f \( -name '*.pb.h' -o -name '*.pb.cc' \) -exec rm {} +
+	rm -rf $(CPP_PROTO_ROOT)
 	mkdir -p $(CPP_PROTO_ROOT)
 	build/werror.sh $(PROTOC) -I$(PKG_ROOT):$(GOGO_PROTOBUF_PATH):$(PROTOBUF_PATH) --cpp_out=lite:$(CPP_PROTO_ROOT) $(CPP_PROTOS)
 	$(SED_INPLACE) -E '/gogoproto/d' $(CPP_HEADERS) $(CPP_SOURCES)
 	touch $@
 
 $(CPP_PROTOS_CCL_TARGET): $(PROTOC) $(CPP_PROTOS_CCL)
-	$(FIND_RELEVANT) -type f \( -name '*.pb.h' -o -name '*.pb.cc' \) -exec rm {} +
+	rm -rf $(CPP_PROTO_CCL_ROOT)
 	mkdir -p $(CPP_PROTO_CCL_ROOT)
 	build/werror.sh $(PROTOC) -I$(PKG_ROOT):$(GOGO_PROTOBUF_PATH):$(PROTOBUF_PATH) --cpp_out=lite:$(CPP_PROTO_CCL_ROOT) $(CPP_PROTOS_CCL)
 	$(SED_INPLACE) -E '/gogoproto/d' $(CPP_HEADERS_CCL) $(CPP_SOURCES_CCL)