Skip to content

Fix compiler detection for cargo-zigbuild #1359

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

Closed
wants to merge 3 commits into from
Closed

Fix compiler detection for cargo-zigbuild #1359

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a59f81
Fix compiler detection for cargo-zigbuild
NobodyXu Jan 11, 2025
fada001
Fix compilation in tool.rs
NobodyXu Jan 11, 2025
162de1b
Fix clippy warning in tool.rs
NobodyXu Jan 11, 2025
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
26 changes: 13 additions & 13 deletions src/tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,11 @@ impl Tool {
}

fn guess_family_from_stdout(
stdout: &str,
stdout: &[u8],
path: &Path,
cargo_output: &CargoOutput,
) -> Result<ToolFamily, Error> {
let stdout = String::from_utf8_lossy(stdout);
cargo_output.print_debug(&stdout);

// https://gitlab.kitware.com/cmake/cmake/-/blob/69a2eeb9dff5b60f2f1e5b425002a0fd45b7cadb/Modules/CMakeDetermineCompilerId.cmake#L267-271
Expand Down Expand Up @@ -192,18 +193,17 @@ impl Tool {
path,
&compiler_detect_output,
)?;
let stdout = String::from_utf8_lossy(&stdout);

if stdout.contains("-Wslash-u-filename") {
let stdout = run_output(
Command::new(path).arg("-E").arg("--").arg(tmp.path()),
path,
&compiler_detect_output,
)?;
let stdout = String::from_utf8_lossy(&stdout);
guess_family_from_stdout(&stdout, path, cargo_output)
} else {
guess_family_from_stdout(&stdout, path, cargo_output)

match guess_family_from_stdout(&stdout, path, cargo_output) {
Err(_) if String::from_utf8_lossy(&stdout).contains("-Wslash-u-filename") => {
let stdout = run_output(
Command::new(path).arg("-E").arg("--").arg(tmp.path()),
path,
&compiler_detect_output,
)?;
guess_family_from_stdout(&stdout, path, cargo_output)
}
res => res,
}
}
let detect_family = |path: &Path| -> Result<ToolFamily, Error> {
Expand Down
Loading