Merge pull request #493 from darcagn/master

Fix passing custom CG_RUSTFLAGS when building sysroot
rust-lang · Apr 17, 2024 · ab7d138 · ab7d138
2 parents 6e5395a + 50a0d5b
commit ab7d138
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/build_system/src/build.rs b/build_system/src/build.rs
@@ -153,6 +153,11 @@ pub fn build_sysroot(env: &HashMap<String, String>, config: &ConfigInfo) -> Resu
         "debug"
     };
 
+    if let Ok(cg_rustflags) = std::env::var("CG_RUSTFLAGS") {
+        rustflags.push(' ');
+        rustflags.push_str(&cg_rustflags);
+    }
+
     let mut env = env.clone();
     env.insert("RUSTFLAGS".to_string(), rustflags);
     run_command_with_output_and_env(&args, Some(&start_dir), Some(&env))?;