fix: allow setting PROTOC environment variable (#1414)

* fix: allow setting PROTOC environment variable * fix: allow setting PROTOC environment variable
kcl-lang · Jun 19, 2024 · 71a192e · 71a192e
1 parent 3c4b568
commit 71a192e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/kclvm/api/build.rs b/kclvm/api/build.rs
@@ -5,10 +5,12 @@ use prost_wkt_build::{FileDescriptorSet, Message};
 /// According to the file kclvm/spec/gpyrpc/gpyrpc.proto, automatically generate
 /// the corresponding rust source file to the directory src/model
 fn main() {
-    std::env::set_var(
-        "PROTOC",
-        protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(),
-    );
+    if env::var("PROTOC").is_err() {
+        env::set_var(
+            "PROTOC",
+            protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(),
+        );
+    }
 
     let out = PathBuf::from(env::var("OUT_DIR").unwrap());
     let descriptor_file = out.join("kclvm_service_descriptor.bin");

diff --git a/kclvm/third-party/prost-wkt/wkt-types/build.rs b/kclvm/third-party/prost-wkt/wkt-types/build.rs
@@ -13,10 +13,12 @@ use regex::Regex;
 
 fn main() {
     //hack: set protoc_bin_vendored::protoc_bin_path() to PROTOC
-    std::env::set_var(
-        "PROTOC",
-        protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(),
-    );
+    if env::var("PROTOC").is_err() {
+        env::set_var(
+            "PROTOC",
+            protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(),
+        );
+    }
     let dir = PathBuf::from(env::var("OUT_DIR").unwrap());
     process_prost_pbtime(&dir);