about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAleksey Kladov <aleksey.kladov@gmail.com>2020-08-31 12:51:55 +0200
committerGitHub <noreply@github.com>2020-08-31 12:51:55 +0200
commitbd91b085078b8bfca32bbc0f4583db04eda2f076 (patch)
tree84c3acd1eaa5b3654e92bb1dc97c366550c11854
parentf8481745aa644afb18b1310e156bf07bed43bcad (diff)
parent00d459a93fb5043d82f8b1893aa5b6f55c2fed5c (diff)
downloadrust-bd91b085078b8bfca32bbc0f4583db04eda2f076.tar.gz
rust-bd91b085078b8bfca32bbc0f4583db04eda2f076.zip
Rollup merge of #76134 - CDirkx:patch-1, r=nagisa
Update MinGW instructions to include ninja

Rust now requires `ninja` to build, so the MinGW build instructions are updated to reflect this.

Like for `python` and `cmake`, the `mingw-w64-x86_64-ninja` package should be used. The default package from the `msys2` subsystem doesn't handle paths correctly on windows.
-rw-r--r--README.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/README.md b/README.md
index fe9776bc5f8..095ffdd04b9 100644
--- a/README.md
+++ b/README.md
@@ -112,7 +112,7 @@ build.
    # Install build tools needed for Rust. If you're building a 32-bit compiler,
    # then replace "x86_64" below with "i686". If you've already got git, python,
    # or CMake installed and in PATH you can remove them from this list. Note
-   # that it is important that you do **not** use the 'python2' and 'cmake'
+   # that it is important that you do **not** use the 'python2', 'cmake' and 'ninja'
    # packages from the 'msys2' subsystem. The build has historically been known
    # to fail with these packages.
    $ pacman -S git \
@@ -121,7 +121,8 @@ build.
                tar \
                mingw-w64-x86_64-python \
                mingw-w64-x86_64-cmake \
-               mingw-w64-x86_64-gcc
+               mingw-w64-x86_64-gcc \
+               mingw-w64-x86_64-ninja
    ```
 
 4. Navigate to Rust's source code (or clone it), then build it: