Merge pull request #3842 from nathaniel-bennett/rustc-wrapper-fix

Add RUSTC_WRAPPER support to build script
rust-lang · Aug 16, 2024 · fc28283 · fc28283
2 parents 6eddffb + 8dba4a0
commit fc28283
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/build.rs b/build.rs
@@ -120,8 +120,16 @@ fn rustc_minor_nightly() -> (u32, bool) {
         };
     }
 
-    let rustc = otry!(env::var_os("RUSTC"));
-    let output = Command::new(rustc)
+    let rustc = env::var_os("RUSTC").expect("Failed to get rustc version: missing RUSTC env");
+    let mut cmd = if let Some(wrapper) = env::var_os("RUSTC_WRAPPER").filter(|w| !w.is_empty()) {
+        let mut cmd = Command::new(wrapper);
+        cmd.arg(rustc);
+        cmd
+    } else {
+        Command::new(rustc)
+    };
+
+    let output = cmd
         .arg("--version")
         .output()
         .ok()