Skip to content

Commit

Permalink
Include Cargo rustc configuration in probe
Browse files Browse the repository at this point in the history
Without this, environments that configure `RUSTFLAGS` or the
`RUSTC_WRAPPER` in ways that break compilation with `backtrace` will
fail to compile anyhow (see dtolnay#156).

With this, the compiler probe takes into account that Cargo
configuration, and thus (more) accurately represents whether the
`backtrace` feature can be safely enabled.

Requires rust-lang/cargo#9600.

Fixes dtolnay#156.
  • Loading branch information
Jon Gjengset committed Jun 18, 2021
1 parent b4f670d commit 6c31e5b
Showing 1 changed file with 27 additions and 5 deletions.
32 changes: 27 additions & 5 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,39 @@ fn compile_probe() -> Option<ExitStatus> {
let out_dir = env::var_os("OUT_DIR")?;
let probefile = Path::new(&out_dir).join("probe.rs");
fs::write(&probefile, PROBE).ok()?;
Command::new(rustc)
.stderr(Stdio::null())

// Make sure to pick up Cargo rustc configuration.
let mut cmd = if let Some(wrapper) = env::var_os("CARGO_RUSTC_WRAPPER") {
let mut cmd = Command::new(wrapper);
// The wrapper's first argument should always be the path to rustc.
cmd.arg(rustc);
cmd
} else {
Command::new(rustc)
};

cmd.stderr(Stdio::null())
.arg("--edition=2018")
.arg("--crate-name=anyhow_build")
.arg("--crate-type=lib")
.arg("--emit=metadata")
.arg("--out-dir")
.arg(out_dir)
.arg(probefile)
.status()
.ok()
.arg(probefile);

// If Cargo wants to set RUSTFLAGS, use that.
if let Ok(rustflags) = env::var("CARGO_RUSTFLAGS") {
// NOTE: This is the same RUSTFLAGS splitting used in cargo.
for arg in rustflags
.split(' ')
.map(str::trim)
.filter(|s| !s.is_empty())
{
cmd.arg(arg);
}
}

cmd.status().ok()
}

fn rustc_minor_version() -> Option<u32> {
Expand Down

0 comments on commit 6c31e5b

Please sign in to comment.