diff options
| author | bors <bors@rust-lang.org> | 2024-02-19 06:59:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-19 06:59:32 +0000 |
| commit | 010f029c905ffeb01ad88288b2cf50efe65b23ae (patch) | |
| tree | cf3e5436c033a6b38daa21eb498b7f53d417936c /compiler/rustc_codegen_ssa/src/errors.rs | |
| parent | 90fccaad801a929fc482dbbeca0231aa197de7c7 (diff) | |
| parent | e118c3e8af2ee5c0d20d21e8bf08c1a254a317fb (diff) | |
Auto merge of #3306 - rust-lang:rustup-2024-02-19, r=RalfJung
Automatic Rustup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/errors.rs')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/errors.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/errors.rs b/compiler/rustc_codegen_ssa/src/errors.rs index 3d7903b5efb..e42a8bd9ed9 100644 --- a/compiler/rustc_codegen_ssa/src/errors.rs +++ b/compiler/rustc_codegen_ssa/src/errors.rs @@ -362,8 +362,11 @@ impl<G: EmissionGuarantee> IntoDiagnostic<'_, G> for LinkingFailed<'_> { // which by now we have no way to translate. if contains_undefined_ref { diag.note(fluent::codegen_ssa_extern_funcs_not_found) - .note(fluent::codegen_ssa_specify_libraries_to_link) - .note(fluent::codegen_ssa_use_cargo_directive); + .note(fluent::codegen_ssa_specify_libraries_to_link); + + if rustc_session::utils::was_invoked_from_cargo() { + diag.note(fluent::codegen_ssa_use_cargo_directive); + } } diag } |
