Allow CXX environment variable to override g++ for musl build (#500)

ramosbugs · web-flow · commit 8dd16b4ea301 · 2020-12-07T12:19:43.000+08:00
Signed-off-by: David A. Ramos &lt;ramos@cs.stanford.edu&gt;
diff --git a/grpc-sys/build.rs b/grpc-sys/build.rs
@@ -75,7 +75,9 @@ fn build_grpc(cc: &mut cc::Build, library: &str) {
             println!("cargo:rustc-link-lib=framework=CoreFoundation");
         }
 
-        if env::var("CARGO_CFG_TARGET_ENV").unwrap() == "musl" {
+        if let Some(val) = get_env("CXX") {
+            config.define("CMAKE_CXX_COMPILER", val);
+        } else if env::var("CARGO_CFG_TARGET_ENV").unwrap() == "musl" {
             config.define("CMAKE_CXX_COMPILER", "g++");
         }
 

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,9 @@ fn build_grpc(cc: &mut cc::Build, library: &str) {`
`75`	`75`	`println!("cargo:rustc-link-lib=framework=CoreFoundation");`
`76`	`76`	`}`
`77`	`77`
`78`		`- if env::var("CARGO_CFG_TARGET_ENV").unwrap() == "musl" {`
	`78`	`+ if let Some(val) = get_env("CXX") {`
	`79`	`+ config.define("CMAKE_CXX_COMPILER", val);`
	`80`	`+ } else if env::var("CARGO_CFG_TARGET_ENV").unwrap() == "musl" {`
`79`	`81`	`config.define("CMAKE_CXX_COMPILER", "g++");`
`80`	`82`	`}`
`81`	`83`