Skip to content

fix: change the way to decide whether there's a RUSTC_WORKSPACE_WRAPPER #2408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: change the way to decide whether there's a RUSTC_WORKSPACE_WRAPPER #2408

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/compiler/compiler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,13 +1292,12 @@ where

let maybe_rustc_executable = if is_rustc_like(executable) {
Some(executable.to_path_buf())
} else if env.iter().any(|(k, _)| k == OsStr::new("CARGO")) {
// If not, detect the scenario where cargo is configured to wrap rustc with something other than sccache.
// This happens when sccache is used as a `RUSTC_WRAPPER` and another tool is used as a
// `RUSTC_WORKSPACE_WRAPPER`. In that case rustc will be the first argument rather than the command.
//
// The check for the `CARGO` env acts as a guardrail against false positives.
// https://doc.rust-lang.org/cargo/reference/environment-variables.html#environment-variables-cargo-reads
} else if env
.iter()
.any(|(k, _)| k == OsStr::new("RUSTC_WORKSPACE_WRAPPER") || k == OsStr::new("CARGO"))
{
// When sccache is used as a `RUSTC_WRAPPER` and another tool is used as a `RUSTC_WORKSPACE_WRAPPER`,
// rustc will be the first argument rather than the command.
args.iter()
.next()
.filter(|arg1| is_rustc_like(arg1))
Expand Down