mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #45828 - pornel:printoption, r=nrc

Browse Source 
Remove deprecated message

Follow up of #43067
This commit is contained in:
kennytm 2017-11-13 17:09:40 +08:00 committed by GitHub
commit e3ca816d36
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/librustc_trans/back/link.rs
View File

@ -503,31 +503,10 @@ fn link_staticlib(sess: &Session,
if !all_native_libs.is_empty() { if !all_native_libs.is_empty() {
if sess.opts.prints.contains(&PrintRequest::NativeStaticLibs) { if sess.opts.prints.contains(&PrintRequest::NativeStaticLibs) {
print_native_static_libs(sess, &all_native_libs); 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]) { fn print_native_static_libs(sess: &Session, all_native_libs: &[NativeLibrary]) {
let lib_args: Vec<_> = all_native_libs.iter() let lib_args: Vec<_> = all_native_libs.iter()
.filter(|l| relevant_lib(sess, l)) .filter(|l| relevant_lib(sess, l))