Rollup merge of #142595 - workingjubilee:revert-warning-138139, r=ChrisDenton
Revert overeager warning for misuse of `--print native-static-libs` In a PR to emit warnings on misuse of `--print native-static-libs`, we did not consider the matter of composing parts of build systems. If you are not directly invoking rustc, it can be difficult to know when you will in fact compile a staticlib, so making sure uses `--print native-static-lib` correctly can be just a nuisance. Next cycle we can reland a slightly more narrowly focused variant or one that focuses on `--emit` instead of `--print native-static-libs`. But in its current state, I am not sure the warning is very useful.
This commit is contained in:
@@ -69,23 +69,6 @@ pub fn ensure_removed(dcx: DiagCtxtHandle<'_>, path: &Path) {
|
||||
}
|
||||
}
|
||||
|
||||
fn check_link_info_print_request(sess: &Session, crate_types: &[CrateType]) {
|
||||
let print_native_static_libs =
|
||||
sess.opts.prints.iter().any(|p| p.kind == PrintKind::NativeStaticLibs);
|
||||
let has_staticlib = crate_types.iter().any(|ct| *ct == CrateType::Staticlib);
|
||||
if print_native_static_libs {
|
||||
if !has_staticlib {
|
||||
sess.dcx()
|
||||
.warn(format!("cannot output linkage information without staticlib crate-type"));
|
||||
sess.dcx()
|
||||
.note(format!("consider `--crate-type staticlib` to print linkage information"));
|
||||
} else if !sess.opts.output_types.should_link() {
|
||||
sess.dcx()
|
||||
.warn(format!("cannot output linkage information when --emit link is not passed"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Performs the linkage portion of the compilation phase. This will generate all
|
||||
/// of the requested outputs for this compilation session.
|
||||
pub fn link_binary(
|
||||
@@ -208,8 +191,6 @@ pub fn link_binary(
|
||||
}
|
||||
}
|
||||
|
||||
check_link_info_print_request(sess, &codegen_results.crate_info.crate_types);
|
||||
|
||||
// Remove the temporary object file and metadata if we aren't saving temps.
|
||||
sess.time("link_binary_remove_temps", || {
|
||||
// If the user requests that temporaries are saved, don't delete any.
|
||||
|
||||
Reference in New Issue
Block a user