mirrors/thiserror
1
0
Fork 0
mirror of https://github.com/dtolnay/thiserror.git synced 2025-04-04 13:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Apply RUSTC_WORKSPACE_WRAPPER

Browse source
This commit is contained in:
David Tolnay 2024-03-25 22:11:44 -07:00
parent ba33438c88
commit 488d52f111
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
build.rs
View file

@ -1,5 +1,6 @@
use std::env; use std::env;
use std::ffi::OsString; use std::ffi::OsString;
use std::iter;
use std::path::Path; use std::path::Path;
use std::process::{self, Command, Stdio}; use std::process::{self, Command, Stdio};
@ -66,15 +67,15 @@ fn compile_probe(rustc_bootstrap: bool) -> bool {
let out_dir = cargo_env_var("OUT_DIR"); let out_dir = cargo_env_var("OUT_DIR");
let probefile = Path::new("build").join("probe.rs"); let probefile = Path::new("build").join("probe.rs");
// Make sure to pick up Cargo rustc configuration. let rustc_wrapper = env::var_os("RUSTC_WRAPPER").filter(|wrapper| !wrapper.is_empty());
let mut cmd = if let Some(wrapper) = env::var_os("RUSTC_WRAPPER") { let rustc_workspace_wrapper =
let mut cmd = Command::new(wrapper); env::var_os("RUSTC_WORKSPACE_WRAPPER").filter(|wrapper| !wrapper.is_empty());
// The wrapper's first argument is supposed to be the path to rustc. let mut rustc = rustc_wrapper
cmd.arg(rustc); .into_iter()
cmd .chain(rustc_workspace_wrapper)
} else { .chain(iter::once(rustc));
Command::new(rustc) let mut cmd = Command::new(rustc.next().unwrap());
}; cmd.args(rustc);
if !rustc_bootstrap { if !rustc_bootstrap {
cmd.env_remove("RUSTC_BOOTSTRAP"); cmd.env_remove("RUSTC_BOOTSTRAP");