Skip to content

Commit 1f233ac

Browse files
committed
---
yaml --- r: 7631 b: refs/heads/master c: 5cb725a h: refs/heads/master i: 7629: 9f03a98 7627: d7fc5da 7623: 8315a96 7615: 468636b v: v3
1 parent 1db6d82 commit 1f233ac

File tree

3 files changed

+10
-21
lines changed

3 files changed

+10
-21
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 190dbaa5bb56d00443a928d19078932105ff1fc5
2+
refs/heads/master: 5cb725a890a8709deba562b205f4dd897ec9034c

trunk/AUTHORS.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Other authors:
66

77
Adam Bozanich <[email protected]>
88
Andreas Gal <[email protected]>
9-
Austin Seipp <[email protected]>
9+
Austin Seipp <[email protected]>
1010
Ben Striegel <[email protected]>
1111
Benjamin Jackman <[email protected]>
1212
Brendan Eich <[email protected]>

trunk/doc/tutorial.md

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,9 @@ they don't contain references to things that aren't actually defined.
6262

6363
## Installation
6464

65-
On win32, we make an executable [installer][] available. On other
66-
platforms you need to build from a [tarball][].
67-
68-
If you're on windows, download and run the installer. It should install
69-
a self-contained set of tools and libraries to `C:\Program Files\Rust`,
70-
and add `C:\Program Files\Rust\bin` to your `PATH` environment variable.
71-
You should then be able to run the rust compiler as `rustc` directly
72-
from the command line.
73-
74-
On Windows Rust additionally requires [MinGW][mingw] (version
75-
20110802 is known to work). It is currently recommended that windows
76-
development be done under the MinGW shell to ensure that the
77-
environment is configured correctly.
78-
79-
We hope to be distributing binary packages for various other operating
80-
systems at some point in the future, but at the moment only windows
81-
binary installers are being made. Other operating systems must build
82-
from "source".
65+
The Rust compiler currently must be built from a [tarball][]. We hope
66+
to be distributing binary packages for various operating systems in
67+
the future.
8368

8469
***Note:*** The Rust compiler is slightly unusual in that it is written
8570
in Rust and therefore must be built by a precompiled "snapshot" version
@@ -106,6 +91,11 @@ packages:
10691
* gnu make 3.81 or later
10792
* curl
10893

94+
On Windows Rust requires [MinGW][mingw] (version 20110802 is known to
95+
work). It is currently recommended that windows development be done
96+
under the MinGW shell to ensure that the environment is configured
97+
correctly.
98+
10999
Assuming you're on a relatively modern Linux system and have met the
110100
prerequisites, something along these lines should work:
111101

@@ -132,7 +122,6 @@ The install locations can be adjusted by passing a `--prefix` argument
132122
to `configure`. Various other options are also supported, pass `--help`
133123
for more information on them.
134124

135-
[installer]: http://dl.rust-lang.org/dist/rust-0.1-install.exe
136125
[tarball]: http://dl.rust-lang.org/dist/rust-0.1.tar.gz
137126
[mingw]: http://sourceforge.net/projects/mingw/files/Installer/mingw-get-inst/mingw-get-inst-20110802/mingw-get-inst-20110802.exe/download
138127

0 commit comments

Comments
 (0)