diff options
| author | bors <bors@rust-lang.org> | 2022-10-07 07:31:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-07 07:31:53 +0000 |
| commit | 58546803885164d488185fb9cb9fb04fcbe64e30 (patch) | |
| tree | 37e199929bff5c5e717e197a5dfe34e16dba6fb7 /compiler/rustc_codegen_ssa/src/back | |
| parent | cf0fa76f2711a26ff114f005af886479867724f7 (diff) | |
| parent | a09e2f6753078f3ab40b02e8c184d9b2fe07f342 (diff) | |
| download | rust-58546803885164d488185fb9cb9fb04fcbe64e30.tar.gz rust-58546803885164d488185fb9cb9fb04fcbe64e30.zip | |
Auto merge of #102767 - matthiaskrgr:rollup-vcbt81v, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #102577 (Warn about Visual Studio Code branding confusion) - #102720 (do not reverse the expected type and found type for ObligationCauseCo…) - #102744 (rustdoc: remove unused CSS `.content .item-list`) - #102747 (rustdoc: remove unused CSS `.docblock a:not(.srclink)`) - #102748 (Disable compressed debug sections on i586-gnu) - #102761 (let-else: test else block with non-never uninhabited type) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/back')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 6131bb4baf5..9a0c379b4e4 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -977,9 +977,10 @@ fn link_natively<'a>( but `link.exe` was not found", ); sess.note_without_error( - "please ensure that VS 2013, VS 2015, VS 2017, VS 2019 or VS 2022 \ - was installed with the Visual C++ option", + "please ensure that Visual Studio 2017 or later, or Build Tools \ + for Visual Studio were installed with the Visual C++ option.", ); + sess.note_without_error("VS Code is a different product, and is not sufficient."); } sess.abort_if_errors(); } |