Skip to content

Commit bf878c8

Browse files
Mention windows ABIs explicitly in README.md
1 parent e2e85b7 commit bf878c8

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

README.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ for interop with software produced by Visual Studio use the MSVC build of Rust;
5959
for interop with GNU software built using the MinGW/MSYS2 toolchain use the GNU
6060
build.
6161
62-
6362
#### MinGW
6463
6564
[MSYS2][msys2] can be used to easily build Rust on Windows:
@@ -106,25 +105,13 @@ MSVC builds of Rust additionally require an installation of Visual Studio 2013
106105
(or later) so `rustc` can use its linker. Make sure to check the “C++ tools”
107106
option.
108107

109-
With these dependencies installed, you can build the compiler with:
108+
With these dependencies installed, you can build the compiler in a `cmd.exe`
109+
shell with:
110110

111111
```sh
112112
> python x.py build
113113
```
114114

115-
If you're running inside of an msys shell, however, you can run:
116-
117-
```sh
118-
$ ./x.py build --build=x86_64-pc-windows-msvc
119-
$ ./x.py dist --build=x86_64-pc-windows-msvc --install
120-
```
121-
122-
> ***Note:*** The build option can also be configured by copying
123-
> the config file and adjusting the `build` option under `[build]`.
124-
> ```sh
125-
> $ cp ./src/bootstrap/config.toml.example ./config.toml
126-
> ```
127-
128115
Currently building Rust only works with some known versions of Visual Studio. If
129116
you have a more recent version installed the build system doesn't understand
130117
then you may need to force rustbuild to use an older version. This can be done
@@ -135,6 +122,19 @@ CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.
135122
python x.py build
136123
```
137124

125+
#### Specifying an ABI
126+
127+
Each specific ABI can also be used from either environment (for example, using
128+
the GNU ABI in powershell) by using an explicit build triple. The available
129+
Windows build triples are:
130+
- `x86_64-pc-windows-gnu` - The GNU ABI (using GCC)
131+
- `x86_64-pc-windows-msvc` - The MSVC ABI
132+
133+
The build triple can be specified by either specifying `--build=ABI` when
134+
invoking `x.py` commands, or by copying the `config.toml` file (as described
135+
in Building From Source), and modifying the `build` option under the `[build]`
136+
section.
137+
138138
### Configure and Make
139139

140140
While it's not the recommended build system, this project also provides a

0 commit comments

Comments
 (0)