Skip to content
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

Use RUSTC_WRAPPER if no other wrapper is provided #918

Merged
merged 2 commits into from
Jan 26, 2024
Merged

Use RUSTC_WRAPPER if no other wrapper is provided #918

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a756a78
Use RUSTC_WRAPPER if no other wrapper is provided
LeonMatthesKDAB Jan 19, 2024
3ca9f30
Add #[allow(dead_code)] to ArchSpec::Catalyst
LeonMatthesKDAB Jan 26, 2024
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
7 changes: 6 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2382,6 +2382,7 @@ impl Build {
enum ArchSpec {
Device(&'static str),
Simulator(&'static str),
#[allow(dead_code)]
Catalyst(&'static str),
}

Expand Down Expand Up @@ -2761,7 +2762,11 @@ impl Build {
// interpretation at all, just pass it on through. This'll hopefully get
// us to support spaces-in-paths.
if Path::new(&*tool).exists() {
return Some((PathBuf::from(&*tool), None, Vec::new()));
return Some((
PathBuf::from(&*tool),
Self::rustc_wrapper_fallback(),
Vec::new(),
));
}

// Ok now we want to handle a couple of scenarios. We'll assume from
Expand Down