Build protoc from source

solana-labs · Jul 29, 2022 · 8bf5583 · 8bf5583
1 parent 45360fc
commit 8bf5583
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 0 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
diff --git a/storage-bigtable/build-proto/Cargo.lock b/storage-bigtable/build-proto/Cargo.lock
diff --git a/storage-bigtable/build-proto/Cargo.toml b/storage-bigtable/build-proto/Cargo.toml
@@ -12,4 +12,5 @@ version = "1.11.5"
 [workspace]
 
 [dependencies]
+protobuf-src = "1.0.5"
 tonic-build = "0.8.0"
diff --git a/storage-bigtable/build-proto/src/main.rs b/storage-bigtable/build-proto/src/main.rs
@@ -1,4 +1,5 @@
 fn main() -> Result<(), std::io::Error> {
+    std::env::set_var("PROTOC", protobuf_src::protoc());
     let manifest_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
 
     let out_dir = manifest_dir.join("../proto");

diff --git a/storage-proto/Cargo.toml b/storage-proto/Cargo.toml
@@ -29,4 +29,5 @@ name = "solana_storage_proto"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
+protobuf-src = "1.0.5"
 tonic-build = "0.8.0"
diff --git a/storage-proto/build.rs b/storage-proto/build.rs
@@ -1,4 +1,5 @@
 fn main() -> Result<(), std::io::Error> {
+    std::env::set_var("PROTOC", protobuf_src::protoc());
     let proto_base_path = std::path::PathBuf::from("proto");
     let proto_files = ["confirmed_block.proto", "transaction_by_addr.proto"];
     let mut protos = Vec::new();