aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-05-16 22:46:46 -0700
committerSteven Fackler <[email protected]>2016-05-16 22:46:46 -0700
commit8fbc17ee7bc2ec8141c107ef23a0c13c4c45676b (patch)
tree0fe0f7544f720215eb84d629533289d2aa3dd410
parentMerge pull request #393 from nox/bitflags (diff)
parentFix order of 32- and 64-bit for mingw toolchain (diff)
downloadrust-openssl-8fbc17ee7bc2ec8141c107ef23a0c13c4c45676b.tar.xz
rust-openssl-8fbc17ee7bc2ec8141c107ef23a0c13c4c45676b.zip
Merge pull request #360 from pingzing/master
Clarify windows build instructions
-rw-r--r--README.md28
1 files changed, 24 insertions, 4 deletions
diff --git a/README.md b/README.md
index e082464b..fd8cc2ee 100644
--- a/README.md
+++ b/README.md
@@ -44,10 +44,30 @@ export OPENSSL_LIB_DIR=`brew --prefix openssl`/lib
On Windows, consider building with [mingw-w64](http://mingw-w64.org/).
Build script will try to find mingw in `PATH` environment variable to provide
Cargo with location where openssl libs from mingw-w64 package may be found.
-If you followed guide [Building on Windows](https://github.com/rust-lang/rust#building-on-windows)
-from rust repo, then you should have [MSYS2](http://msys2.github.io/) with
-`mingw-w64-openssl` installed as part of `mingw-w64-x86_64-toolchain`
-(or `mingw-w64-i686-toolchain`) package.
+
+mingw-w64 can be easily installed by using [MSYS2](http://msys2.github.io/). Install MSYS2 according to the instructions, and then, from an MSYS2 Shell, install mingw-w64:
+
+32-bit:
+```bash
+pacman -S mingw-w64-i686-gcc
+```
+
+64-bit
+```bash
+pacman -S mingw-w64-x86_64-gcc
+```
+
+and then install the mingw-w64 toolchain.
+
+32-bit:
+```bash
+pacman -S mingw-w64-i686-toolchain
+```
+
+64-bit:
+```bash
+pacman -S mingw-w64-x86_64-toolchain
+```
Alternatively, install OpenSSL from [here][1]. Cargo will not be able to find OpenSSL if it's
installed to the default location. You can either copy the `include/openssl`