Auto merge of #121866 - Kobzol:opt-dist-find-llvm, r=Mark-Simulacrum
Modify opt-dist logic for finding LLVM artifacts This is the `rustc` side of fixing https://github.com/rust-lang/rust/pull/121395#issuecomment-1973572885.
This commit is contained in:
commit
51f483944d
@ -15,8 +15,21 @@ pub fn print_binary_sizes(env: &Environment) -> anyhow::Result<()> {
|
||||
|
||||
let root = env.build_artifacts().join("stage2");
|
||||
|
||||
let all_lib_files = get_files_from_dir(&root.join("lib"), None)?;
|
||||
|
||||
let mut files = get_files_from_dir(&root.join("bin"), None)?;
|
||||
files.extend(get_files_from_dir(&root.join("lib"), Some(".so"))?);
|
||||
|
||||
// libLLVM.so can be named libLLVM.so.<suffix>, so we try to explicitly add it here if it
|
||||
// wasn't found by the above call.
|
||||
if !files.iter().any(|f| f.file_name().unwrap_or_default().starts_with("libLLVM")) {
|
||||
if let Some(llvm_lib) =
|
||||
all_lib_files.iter().find(|f| f.file_name().unwrap_or_default().starts_with("libLLVM"))
|
||||
{
|
||||
files.push(llvm_lib.clone());
|
||||
}
|
||||
}
|
||||
|
||||
files.sort_unstable();
|
||||
|
||||
let items: Vec<_> = files
|
||||
|
Loading…
Reference in New Issue
Block a user