librustc: Stop assuming that implementations and traits only contain

[rust.git] / README.md

diff --git a/README.md b/README.md
index 8f498240802c0a67a257612bd37ad7c70e905656..1da02fea018784f8a1cb4dc9acb7ba153f824372 100644 (file)
--- a/README.md
+++ b/README.md
@@ -13,14 +13,14 @@ documentation.
 > [getting started][wiki-start] notes on the wiki.
 
 [installer]: http://www.rust-lang.org/install.html
-[tutorial]: http://static.rust-lang.org/doc/tutorial.html
-[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
-[win-wiki]: https://github.com/mozilla/rust/wiki/Using-Rust-on-Windows
+[tutorial]: http://doc.rust-lang.org/tutorial.html
+[wiki-start]: https://github.com/rust-lang/rust/wiki/Note-getting-started-developing-Rust
+[win-wiki]: https://github.com/rust-lang/rust/wiki/Using-Rust-on-Windows
 
 ## Building from Source
 
 1. Make sure you have installed the dependencies:
-    * `g++` 4.4 or `clang++` 3.x
+    * `g++` 4.7 or `clang++` 3.x
     * `python` 2.6 or later (but not 3.x)
     * `perl` 5.0 or later
     * GNU `make` 3.81 or later
@@ -32,13 +32,13 @@ documentation.
 
     To build from the [tarball] do:
 
-        $ curl -O http://static.rust-lang.org/dist/rust-nightly.tar.gz
+        $ curl -O https://static.rust-lang.org/dist/rust-nightly.tar.gz
         $ tar -xzf rust-nightly.tar.gz
         $ cd rust-nightly
 
     Or to build from the [repo] do:
 
-        $ git clone https://github.com/mozilla/rust.git
+        $ git clone https://github.com/rust-lang/rust.git
         $ cd rust
 
     Now that you have Rust's source code, you can configure and build it:
@@ -54,13 +54,29 @@ documentation.
     When complete, `make install` will place several programs into
     `/usr/local/bin`: `rustc`, the Rust compiler, and `rustdoc`, the
     API-documentation tool.
-    system.
 3. Read the [tutorial].
 4. Enjoy!
 
-[repo]: https://github.com/mozilla/rust
-[tarball]: http://static.rust-lang.org/dist/rust-nightly.tar.gz
-[tutorial]: http://static.rust-lang.org/doc/master/tutorial.html
+### Building on Windows
+
+To easily build on windows we can use [MSYS2](http://sourceforge.net/projects/msys2/):
+
+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
+
+3. With that now start `mingw32_shell.bat` from where you installed MSYS2 (i.e. `C:\msys`).
+4. From there just navigate to where you have Rust's source code, configure and build it:
+
+        $ ./configure --build=i686-pc-mingw32
+        $ make && make install
+
+[repo]: https://github.com/rust-lang/rust
+[tarball]: https://static.rust-lang.org/dist/rust-nightly.tar.gz
+[tutorial]: http://doc.rust-lang.org/tutorial.html
 
 ## Notes
 
@@ -83,7 +99,7 @@ swap, it will take a very long time to build.
 
 There is a lot more documentation in the [wiki].
 
-[wiki]: https://github.com/mozilla/rust/wiki
+[wiki]: https://github.com/rust-lang/rust/wiki
 
 ## License