Skip to content

Commit ed45c1d

Browse files
authored
Merge pull request #1753 from rbtcollins/patch-1
Correctly document rustup defaults on Windows
2 parents 4017736 + 1d95dbe commit ed45c1d

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

README.md

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -423,17 +423,25 @@ of Visual Studio 2013 (or later) or the Visual C++ Build Tools
423423
check the "C++ tools" option. No additional software installation is
424424
necessary for basic use of the GNU build.
425425

426-
By default rustup on Windows configures Rust to target the 32-bit MSVC
427-
ABI, that is the `i686-pc-windows-msvc` target triple. More
428-
specifically, the toolchains that rustup chooses to install, unless
426+
By default rustup on Windows configures Rust to target the MSVC
427+
ABI, that is a target triple of either `i686-pc-windows-msvc` or
428+
`x86_64-pc-windows-msvc` depending on the CPU architecture of the
429+
host Windows OS. The toolchains that rustup chooses to install, unless
429430
told otherwise through the [toolchain specification], will be compiled
430-
to run on a `i686-pc-windows-msvc` host, and will target that platform
431-
by default. When you write `rustup update nightly`, rustup interprets
432-
it as `rustup update nightly-i686-pc-windows-msvc`. You can change this
433-
behavior with `rustup set default-host` or during installation.
431+
to run on that target triple host and will target that triple by default.
432+
433+
You can change this behavior with `rustup set default-host` or during installation.
434+
435+
For example, to explicitly select the 32-bit MSVC host:
436+
437+
```console
438+
$ rustup set default-host i686-pc-windows-msvc
439+
```
440+
441+
Or to choose the 64 bit GNU toolchain:
434442

435443
```console
436-
$ rustup set default-host x86_64-pc-windows-msvc
444+
$ rustup set default-host x86_64-pc-windows-gnu
437445
```
438446

439447
[toolchain specification]: #toolchain-specification

0 commit comments

Comments
 (0)