Rollup merge of #45828 - pornel:printoption, r=nrc
Remove deprecated message Follow up of #43067
This commit is contained in:
commit
e3ca816d36
@ -503,31 +503,10 @@ fn link_staticlib(sess: &Session,
|
||||
if !all_native_libs.is_empty() {
|
||||
if sess.opts.prints.contains(&PrintRequest::NativeStaticLibs) {
|
||||
print_native_static_libs(sess, &all_native_libs);
|
||||
} else {
|
||||
// Fallback for backwards compatibility only
|
||||
print_native_static_libs_legacy(sess, &all_native_libs);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn print_native_static_libs_legacy(sess: &Session, all_native_libs: &[NativeLibrary]) {
|
||||
sess.note_without_error("link against the following native artifacts when linking against \
|
||||
this static library");
|
||||
sess.note_without_error("This list will not be printed by default. \
|
||||
Please add --print=native-static-libs if you need this information");
|
||||
|
||||
for lib in all_native_libs.iter().filter(|l| relevant_lib(sess, l)) {
|
||||
let name = match lib.kind {
|
||||
NativeLibraryKind::NativeStaticNobundle |
|
||||
NativeLibraryKind::NativeUnknown => "library",
|
||||
NativeLibraryKind::NativeFramework => "framework",
|
||||
// These are included, no need to print them
|
||||
NativeLibraryKind::NativeStatic => continue,
|
||||
};
|
||||
sess.note_without_error(&format!("{}: {}", name, lib.name));
|
||||
}
|
||||
}
|
||||
|
||||
fn print_native_static_libs(sess: &Session, all_native_libs: &[NativeLibrary]) {
|
||||
let lib_args: Vec<_> = all_native_libs.iter()
|
||||
.filter(|l| relevant_lib(sess, l))
|
||||
|
Loading…
Reference in New Issue
Block a user