Skip to content

Commit 089d04b

Browse files
committed
Suggest installing MSYS2 for windows-gnu
1 parent 13e5370 commit 089d04b

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

doc/user-guide/src/installation/other.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ which is a `brew`-managed `rust` toolchain installation.
5656
## Manual installation
5757

5858
You can manually download `rustup-init` for a given target from
59-
`https://static.rust-lang.org/rustup/dist/{target-triple}/rustup-init[.exe]`[^msvc].
59+
`https://static.rust-lang.org/rustup/dist/{target-triple}/rustup-init[.exe]`[^msys2] [^msvc].
6060

6161
<details>
6262
<summary>Direct links</summary>
@@ -83,7 +83,7 @@ You can manually download `rustup-init` for a given target from
8383
- [sha256 file](https://static.rust-lang.org/rustup/dist/i686-apple-darwin/rustup-init.sha256)
8484
- [i686-linux-android](https://static.rust-lang.org/rustup/dist/i686-linux-android/rustup-init)
8585
- [sha256 file](https://static.rust-lang.org/rustup/dist/i686-linux-android/rustup-init.sha256)
86-
- [i686-pc-windows-gnu](https://static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe)
86+
- [i686-pc-windows-gnu](https://static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe)[^msys2]
8787
- [sha256 file](https://static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe.sha256)
8888
- [i686-pc-windows-msvc](https://static.rust-lang.org/rustup/dist/i686-pc-windows-msvc/rustup-init.exe)[^msvc]
8989
- [sha256 file](https://static.rust-lang.org/rustup/dist/i686-pc-windows-msvc/rustup-init.exe.sha256)
@@ -109,7 +109,7 @@ You can manually download `rustup-init` for a given target from
109109
- [sha256 file](https://static.rust-lang.org/rustup/dist/x86_64-apple-darwin/rustup-init.sha256)
110110
- [x86_64-linux-android](https://static.rust-lang.org/rustup/dist/x86_64-linux-android/rustup-init)
111111
- [sha256 file](https://static.rust-lang.org/rustup/dist/x86_64-linux-android/rustup-init.sha256)
112-
- [x86_64-pc-windows-gnu](https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-gnu/rustup-init.exe)
112+
- [x86_64-pc-windows-gnu](https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-gnu/rustup-init.exe)[^msys2]
113113
- [sha256 file](https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-gnu/rustup-init.exe.sha256)
114114
- [x86_64-pc-windows-msvc](https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe)[^msvc]
115115
- [sha256 file](https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe.sha256)
@@ -131,11 +131,15 @@ To get a previous version, use
131131

132132
SHA-256 checksums are also available by appending `.sha256` to the link.
133133

134+
[^msys2]: Windows GNU builds require no additional software for basic use.
135+
However, many library crates will not be able to compile until
136+
the full [MSYS2] with MinGW has been installed.
137+
138+
[MSYS2]: https://www.msys2.org/
139+
134140
[^msvc]: MSVC builds of `rustup` additionally require an [installation of
135141
Visual Studio 2019 or the Visual C++ Build Tools 2019][vs]. For Visual
136-
Studio, make sure to check the "C++ tools" and "Windows 10 SDK" option. No
137-
additional software installation is necessary for basic use of the GNU
138-
build.
142+
Studio, make sure to check the "C++ tools" and "Windows 10 SDK" option.
139143

140144
[vs]: https://visualstudio.microsoft.com/downloads/
141145

doc/user-guide/src/installation/windows.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ the native (MSVC) ABI used by [Visual Studio], and the GNU ABI used by the
77
[GCC toolchain]. Which version of Rust you need depends largely on what C/C++
88
libraries you want to interoperate with: for interop with software produced by
99
Visual Studio use the MSVC build of Rust; for interop with GNU software built
10-
using the [MinGW/MSYS2 toolchain] use the GNU build.
10+
using the [MinGW/MSYS2 toolchain][MSYS2] use the GNU build.
1111

1212
When targeting the MSVC ABI, Rust additionally requires an [installation of
1313
Visual Studio][msvc install] so `rustc` can use its linker and libraries.
14-
No additional software installation is necessary for basic use of the GNU build.
14+
15+
When targeting the GNU ABI, no additional software is strictly required for basic use.
16+
However, many library crates will not be able to compile until the full [MSYS2] with MinGW has been installed.
1517

1618
By default `rustup` on Windows configures Rust to target the MSVC ABI, that is
1719
a target triple of either `i686-pc-windows-msvc`, `x86_64-pc-windows-msvc`, or `aarch64-pc-windows-msvc`
@@ -60,7 +62,7 @@ targets with the same compiler.
6062
[ABIs]: https://en.wikipedia.org/wiki/Application_binary_interface
6163
[cross-compilation]: ../cross-compilation.md
6264
[GCC toolchain]: https://gcc.gnu.org/
63-
[MinGW/MSYS2 toolchain]: https://msys2.github.io/
65+
[MSYS2]: https://www.msys2.org/
6466
[msvc-toolchain]: https://www.rust-lang.org/tools/install?platform_override=win
6567
[toolchain specification]: ../concepts/toolchains.md#toolchain-specification
6668
[msvc install]: windows-msvc.html

0 commit comments

Comments
 (0)