Skip to content

Fix get_base_archiver_variant for clang-cl: use --print-search-dirs #1587

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

Merged
merged 6 commits into from
Oct 6, 2025
Merged

Fix get_base_archiver_variant for clang-cl: use --print-search-dirs #1587

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6829db9
Fix `get_base_archiver_variant` for clang-cl: use `--print-search-dirs`
NobodyXu Oct 6, 2025
e60b86d
Fix lib.rs
NobodyXu Oct 6, 2025
fb0f503
Simplify `search_programs`
NobodyXu Oct 6, 2025
c0da615
Fix fmt in lib.rs
NobodyXu Oct 6, 2025
7a41631
Updated doc and parameter name of `search_programs`
NobodyXu Oct 6, 2025
e9058a7
Fix llvm-lib search_programs fallback in get_base_archiver_variant
NobodyXu Oct 6, 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
54 changes: 27 additions & 27 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3326,12 +3326,8 @@ impl Build {
let compiler = self.get_base_compiler().ok()?;
if compiler.is_like_clang() {
name = format!("llvm-{tool}").into();
self.search_programs(
&mut self.cmd(&compiler.path),
&name,
&self.cargo_output,
)
.map(|name| self.cmd(name))
self.search_programs(&compiler.path, &name, &self.cargo_output)
.map(|name| self.cmd(name))
} else {
None
}
Expand Down Expand Up @@ -3361,23 +3357,30 @@ impl Build {
// here.

let compiler = self.get_base_compiler()?;
let mut lib = String::new();
if compiler.family == (ToolFamily::Msvc { clang_cl: true }) {
// See if there is 'llvm-lib' next to 'clang-cl'
// Another possibility could be to see if there is 'clang'
// next to 'clang-cl' and use 'search_programs()' to locate
// 'llvm-lib'. This is because 'clang-cl' doesn't support
// the -print-search-dirs option.
if let Some(mut cmd) = self.which(&compiler.path, None) {
cmd.pop();
cmd.push("llvm-lib.exe");
if let Some(llvm_lib) = self.which(&cmd, None) {
llvm_lib.to_str().unwrap().clone_into(&mut lib);
let lib = if compiler.family == (ToolFamily::Msvc { clang_cl: true }) {
self.search_programs(
&compiler.path,
Path::new("llvm-lib"),
&self.cargo_output,
)
.or_else(|| {
// See if there is 'llvm-lib' next to 'clang-cl'
if let Some(mut cmd) = self.which(&compiler.path, None) {
cmd.pop();
cmd.push("llvm-lib");
self.which(&cmd, None)
} else {
None
}
}
}
})
} else {
None
};

if lib.is_empty() {
if let Some(lib) = lib {
name = lib;
self.cmd(&name)
} else {
name = PathBuf::from("lib.exe");
let mut cmd = match self.find_msvc_tools_find(&target, "lib.exe") {
Some(t) => t,
Expand All @@ -3387,9 +3390,6 @@ impl Build {
cmd.arg("/machine:arm64ec");
}
cmd
} else {
name = lib.into();
self.cmd(&name)
}
} else if target.os == "illumos" {
// The default 'ar' on illumos uses a non-standard flags,
Expand Down Expand Up @@ -4132,15 +4132,15 @@ impl Build {
}
}

/// search for |prog| on 'programs' path in '|cc| -print-search-dirs' output
/// search for |prog| on 'programs' path in '|cc| --print-search-dirs' output
fn search_programs(
&self,
cc: &mut Command,
cc: &Path,
prog: &Path,
cargo_output: &CargoOutput,
) -> Option<PathBuf> {
let search_dirs = run_output(
cc.arg("-print-search-dirs"),
self.cmd(cc).arg("--print-search-dirs"),
// this doesn't concern the compilation so we always want to show warnings.
cargo_output,
)
Expand Down