Skip to content

Make list of native artifacts to link more compact. #40076

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.

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 1 commit into from
Closed
Changes from all commits
Commits
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
24 changes: 19 additions & 5 deletions src/librustc_trans/back/link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -681,15 +681,29 @@ fn link_staticlib(sess: &Session, objects: &[PathBuf], out_filename: &Path,
platforms, and so may need to be preserved");
}

let mut libraries = String::new();
let mut frameworks = String::new();
fn push(s: &mut String, kind: &str, lib: &NativeLibrary) {
if s.is_empty() {
*s = format!("{}: {}", kind, lib.name)
} else {
s.push_str(&format!(", {}", lib.name))
}
}
for lib in all_native_libs.iter().filter(|l| relevant_lib(sess, l)) {
let name = match lib.kind {
match lib.kind {
NativeLibraryKind::NativeStaticNobundle |
NativeLibraryKind::NativeUnknown => "library",
NativeLibraryKind::NativeFramework => "framework",
NativeLibraryKind::NativeUnknown => push(&mut libraries, "library", lib),
NativeLibraryKind::NativeFramework => push(&mut frameworks, "framework", lib),
// These are included, no need to print them
NativeLibraryKind::NativeStatic => continue,
};
sess.note_without_error(&format!("{}: {}", name, lib.name));
}
}
if !libraries.is_empty() {
sess.note_without_error(&libraries);
}
if !frameworks.is_empty() {
sess.note_without_error(&frameworks);
}
}

Expand Down