From 570d89263d2e817357e3cb826dcd62b08882d0aa Mon Sep 17 00:00:00 2001 From: Nathaniel Date: Fri, 16 Aug 2024 19:14:17 -0400 Subject: [PATCH] Add RUSTC_WRAPPER support to build script (cherry picked from commit 8dba4a03d23ff979eba11afac4ff0b605267cddb) --- build.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/build.rs b/build.rs index 5945799d2423..e445f5b38fe6 100644 --- a/build.rs +++ b/build.rs @@ -196,8 +196,17 @@ 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 = match env::var_os("RUSTC_WRAPPER").as_ref() { + Some(wrapper) if !wrapper.is_empty() => { + let mut cmd = Command::new(wrapper); + cmd.arg(rustc); + cmd + } + _ => Command::new(rustc), + }; + + let output = cmd .arg("--version") .output() .ok()