summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2016-07-06 11:35:33 -0700
committerAlex Crichton <alex@alexcrichton.com>2016-07-07 09:34:46 -0700
commitb67f23c847040b6c5125f1a2e0f4c5d742c69040 (patch)
tree81be67daeb69ff338d5ce15e678f3c50eadb5f91 /README.md
parentAuto merge of #34412 - gnzlbg:document_platform_intrinsics_generate, r=alexcr... (diff)
downloadgrust-b67f23c847040b6c5125f1a2e0f4c5d742c69040.tar.gz
grust-b67f23c847040b6c5125f1a2e0f4c5d742c69040.tar.bz2
grust-b67f23c847040b6c5125f1a2e0f4c5d742c69040.tar.xz
Clarify rustbuild + msvc + vcvars in README
The invocation of vcvars is only needed for versions of Visual Studio that rustbuild or cmake doesn't understand, but if older versions are installed then there's no need to call vcvars. Closes #34576
Diffstat (limited to 'README.md')
-rw-r--r--README.md28
1 files changed, 20 insertions, 8 deletions
diff --git a/README.md b/README.md
index 49236d6b67..283efdd241 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ build.
66 66
67[MSYS2][msys2] can be used to easily build Rust on Windows: 67[MSYS2][msys2] can be used to easily build Rust on Windows:
68 68
69msys2: https://msys2.github.io/ 69[msys2]: https://msys2.github.io/
70 70
711. Grab the latest [MSYS2 installer][msys2] and go through the installer. 711. Grab the latest [MSYS2 installer][msys2] and go through the installer.
72 72
@@ -105,7 +105,7 @@ msys2: https://msys2.github.io/
105 105
106MSVC builds of Rust additionally require an installation of Visual Studio 2013 106MSVC builds of Rust additionally require an installation of Visual Studio 2013
107(or later) so `rustc` can use its linker. Make sure to check the “C++ tools” 107(or later) so `rustc` can use its linker. Make sure to check the “C++ tools”
108option. In addition, `cmake` needs to be installed to build LLVM. 108option.
109 109
110With these dependencies installed, the build takes two steps: 110With these dependencies installed, the build takes two steps:
111 111
@@ -116,13 +116,25 @@ $ make && make install
116 116
117#### MSVC with rustbuild 117#### MSVC with rustbuild
118 118
119For those who don't want the hassle of MSYS or MinGW, you can invoke rustbuild 119The old build system, based on makefiles, is currently being rewritten into a
120directly. All you need are Python 2, CMake, and Git in your PATH (make sure you 120Rust-based build system called rustbuild. This can be used to bootstrap the
121do __not__ use the ones from MSYS!). You'll also need Visual Studio 2013 or 121compiler on MSVC without needing to install MSYS or MinGW. All you need are
122newer with the C++ tools. Then all you need to do is invoke the appropriate 122[Python 2](https://www.python.org/downloads/),
123vcvars bat file and kick off rustbuild. 123[CMake](https://cmake.org/download/), and
124[Git](https://git-scm.com/downloads) in your PATH (make sure you do not use the
125ones from MSYS if you have it installed). You'll also need Visual Studio 2013 or
126newer with the C++ tools. Then all you need to do is to kick off rustbuild.
124 127
125```bat 128```
129python .\src\bootstrap\bootstrap.py
130```
131
132Currently rustbuild only works with some known versions of Visual Studio. If you
133have a more recent version installed that a part of rustbuild doesn't understand
134then you may need to force rustbuild to use an older version. This can be done
135by manually calling the appropriate vcvars file before running the bootstrap.
136
137```
126CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat" 138CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
127python .\src\bootstrap\bootstrap.py 139python .\src\bootstrap\bootstrap.py
128``` 140```