diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-15 14:11:38 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-15 14:11:38 -0800 |
| commit | 87dce0c138af6887704fc2379b7a75e05a1e8b18 (patch) | |
| tree | 3dac2ab4d7d77f9e37a3d7ed667940638946e9b4 | |
| parent | 2890266b27b7dafc848af77baaa6d3a71141aef4 (diff) | |
| parent | 599232503a7959faafa21bc8b38ca98f4b28e536 (diff) | |
rollup merge of #21046: steveklabnik/gh16654
These should help out with the in-tree parts of #16654
| -rw-r--r-- | README.md | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/README.md b/README.md index e858e91773b..147d2e9d2f4 100644 --- a/README.md +++ b/README.md @@ -58,16 +58,23 @@ documentation. ### Building on Windows -To easily build on windows we can use [MSYS2](http://sourceforge.net/projects/msys2/): +To easily build on windows we can use [MSYS2](http://msys2.github.io/): 1. Grab the latest MSYS2 installer and go through the installer. 2. Now from the MSYS2 terminal we want to install the mingw64 toolchain and the other tools we need. - $ pacman -S mingw-w64-i686-toolchain - $ pacman -S base-devel +```bash +# choose one based on platform +$ pacman -S mingw-w64-i686-toolchain +$ pacman -S mingw-w64-x86_64-toolchain -3. With that now start `mingw32_shell.bat` from where you installed MSYS2 (i.e. `C:\msys`). +$ pacman -S base-devel +``` + +3. With that now start `mingw32_shell.bat` or `mingw64_shell.bat` + from where you installed MSYS2 (i.e. `C:\msys`). Which one you + choose depends on if you want 32 or 64 bit Rust. 4. From there just navigate to where you have Rust's source code, configure and build it: $ ./configure |