commit ca4b0630a6364850e3cf1a5f91429cbde5cd2f68
author Mike Kruskal <mkruskal@google.com> Thu Aug 11 20:55:01 2022 -0700
committer Mike Kruskal <mkruskal@google.com> Thu Aug 11 20:55:01 2022 -0700
tree bb98e1d9dbb1aa2a278eabac68e134974d4bdde6
parent 68c77bab53751cab423d1017b7131ca1d7fc70fe
parent 486a10c1f69c02c0557322d182c7693076bf08ed

Sync from Piper @467099277

PROTOBUF_SYNC_PIPER

generate_descriptor_proto.sh

diff --git a/generate_descriptor_proto.sh b/generate_descriptor_proto.sh
index dc03fee..91c1217 100755
--- a/generate_descriptor_proto.sh
+++ b/generate_descriptor_proto.sh
@@ -7,7 +7,7 @@
 # generate.
 #
 # HINT:  Flags passed to generate_descriptor_proto.sh will be passed directly
-#   to make when building protoc.  This is particularly useful for passing
+#   to bazel when building protoc.  This is particularly useful for passing
 #   -j4 to run 4 jobs simultaneously.
 
 if test ! -e src/google/protobuf/stubs/common.h; then
@@ -62,12 +62,12 @@
     PROTOC=$BOOTSTRAP_PROTOC
     BOOTSTRAP_PROTOC=""
   else
-    make -j$(nproc) $@ protoc
+    bazel build $@ //:protoc
     if test $? -ne 0; then
       echo "Failed to build protoc."
       exit 1
     fi
-    PROTOC="./protoc"
+    PROTOC="../bazel-bin/protoc"
   fi
 
   $PROTOC --cpp_out=dllexport_decl=PROTOBUF_EXPORT:$TMP ${RUNTIME_PROTO_FILES[@]} && \