bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't require --verbose to show linker stdout

Browse source
This commit is contained in:
jyn 2025-01-17 08:00:28 -05:00
parent b757663a00
commit 26708aa941
7 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_codegen_ssa/src/back/link.rs
View file

@ -1040,6 +1040,11 @@ fn link_natively(
sess.dcx().abort_if_errors();
}
let stderr = escape_string(&prog.stderr);
let stdout = escape_string(&prog.stdout);
info!("linker stderr:\n{}", &stderr);
info!("linker stdout:\n{}", &stdout);
let (level, src) = codegen_results.crate_info.lint_levels.linker_messages;
let lint = |msg| {
lint_level(sess, LINKER_MESSAGES, level, src, None, |diag| {
@ -1049,16 +1054,14 @@ fn link_natively(
if !prog.stderr.is_empty() {
// We already print `warning:` at the start of the diagnostic. Remove it from the linker output if present.
let stderr = escape_string(&prog.stderr);
debug!("original stderr: {stderr}");
let stderr = stderr
.strip_prefix("warning: ")
.unwrap_or(&stderr)
.replace(": warning: ", ": ");
lint(format!("linker stderr: {stderr}"));
}
if !prog.stdout.is_empty() && sess.opts.verbose {
lint(format!("linker stdout: {}", escape_string(&prog.stdout)))
if !prog.stdout.is_empty() {
lint(format!("linker stdout: {}", stdout))
}
}
Err(e) => {