Skip to content

Commit a2dfae6

Browse files
committed
---
yaml --- r: 142991 b: refs/heads/try2 c: 49b72bd h: refs/heads/master i: 142989: 7100026 142987: 1306660 142983: c6c1b61 142975: 023901f v: v3
1 parent 0c80c40 commit a2dfae6

File tree

419 files changed

+4806
-5339
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

419 files changed

+4806
-5339
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 8d97c905ddecec2e2d0d72926bc4c9e739ccb6e3
8+
refs/heads/try2: 49b72bdd77916e27aaf95909516702c1450f11ac
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ endef
249249

250250
# Same interface as above, but deletes rather than just listing the files.
251251
define REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT
252-
$(Q)MATCHES="$(filter-out %$(3),$(wildcard $(1)/$(2)))"; if [ -n "$$MATCHES" ] ; then echo "Warning: removing previous" \'$(2)\' "libraries:" $$MATCHES; rm $$MATCHES ; fi
252+
$(Q)MATCHES="$(filter-out %$(3),$(wildcard $(1)/$(2)))"; if [ -n "$$MATCHES" ] ; then echo "Warning: removing previous" \'$(2)\' "libraries:" $$MATCHES; rm -v $$MATCHES ; fi
253253
endef
254254

255255
# We use a different strategy for LIST_ALL_OLD_GLOB_MATCHES_EXCEPT

branches/try2/README.md

Lines changed: 48 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -3,72 +3,18 @@
33
This is a compiler for Rust, including standard libraries, tools and
44
documentation.
55

6-
## Quick Start
76

8-
### Windows
7+
## Installation
98

10-
1. Download and use the [installer][win-exe].
11-
2. Read the [tutorial].
12-
2. Enjoy!
9+
The Rust compiler currently must be built from a [tarball], unless you
10+
are on Windows, in which case using the [installer][win-exe] is
11+
recommended.
1312

14-
> ***Note:*** Windows users should read the detailed
15-
> [getting started][wiki-start] notes on the wiki. Even when using
16-
> the binary installer the Windows build requires a MinGW installation,
17-
> the precise details of which are not discussed here.
18-
19-
[tutorial]: http://static.rust-lang.org/doc/tutorial.html
20-
[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
21-
[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe
22-
23-
### Linux / OS X
24-
25-
1. Install the prerequisites (if not already installed)
26-
* g++ 4.4 or clang++ 3.x
27-
* python 2.6 or later (but not 3.x)
28-
* perl 5.0 or later
29-
* gnu make 3.81 or later
30-
* curl
31-
2. Download and build Rust
32-
You can either download a [tarball] or build directly from the [repo].
33-
34-
To build from the [tarball] do:
35-
36-
$ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz
37-
$ tar -xzf rust-0.7.tar.gz
38-
$ cd rust-0.7
39-
40-
Or to build from the [repo] do:
41-
42-
$ git clone https://github.com/mozilla/rust.git
43-
$ cd rust
44-
45-
Now that you have Rust's source code, you can configure and build it:
46-
47-
$ ./configure
48-
$ make && make install
49-
50-
You may need to use `sudo make install` if you do not normally have
51-
permission to modify the destination directory. The install locations can
52-
be adjusted by passing a `--prefix` argument to `configure`. Various other
53-
options are also supported, pass `--help` for more information on them.
54-
55-
When complete, `make install` will place several programs into
56-
`/usr/local/bin`: `rustc`, the Rust compiler; `rustdoc`, the
57-
API-documentation tool, and `rustpkg`, the Rust package manager and build
58-
system.
59-
3. Read the [tutorial].
60-
4. Enjoy!
61-
62-
[repo]: https://github.com/mozilla/rust
63-
[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz
64-
[tutorial]: http://static.rust-lang.org/doc/tutorial.html
65-
66-
## Notes
67-
68-
Since the Rust compiler is written in Rust, it must be built by a
69-
precompiled "snapshot" version of itself (made in an earlier state of
70-
development). As such, source builds require a connection to the Internet, to
71-
fetch snapshots, and an OS that can execute the available snapshot binaries.
13+
Since the Rust compiler is written in Rust, it must be built by
14+
a precompiled "snapshot" version of itself (made in an earlier state
15+
of development). As such, source builds require a connection to
16+
the Internet, to fetch snapshots, and an OS that can execute the
17+
available snapshot binaries.
7218

7319
Snapshot binaries are currently built and tested on several platforms:
7420

@@ -79,12 +25,42 @@ Snapshot binaries are currently built and tested on several platforms:
7925
You may find that other platforms work, but these are our "tier 1"
8026
supported build environments that are most likely to work.
8127

82-
Rust currently needs about 1.8G of RAM to build without swapping; if it hits
83-
swap, it will take a very long time to build.
28+
> ***Note:*** Windows users should read the detailed
29+
> [getting started][wiki-start] notes on the wiki. Even when using
30+
> the binary installer the Windows build requires a MinGW installation,
31+
> the precise details of which are not discussed here.
32+
33+
To build from source you will also need the following prerequisite
34+
packages:
35+
36+
* g++ 4.4 or clang++ 3.x
37+
* python 2.6 or later (but not 3.x)
38+
* perl 5.0 or later
39+
* gnu make 3.81 or later
40+
* curl
41+
42+
Assuming you're on a relatively modern *nix system and have met the
43+
prerequisites, something along these lines should work.
44+
45+
$ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz
46+
$ tar -xzf rust-0.7.tar.gz
47+
$ cd rust-0.7
48+
$ ./configure
49+
$ make && make install
8450

85-
There is lots more documentation in the [wiki].
51+
You may need to use `sudo make install` if you do not normally have
52+
permission to modify the destination directory. The install locations
53+
can be adjusted by passing a `--prefix` argument to
54+
`configure`. Various other options are also supported, pass `--help`
55+
for more information on them.
8656

87-
[wiki]: https://github.com/mozilla/rust/wiki
57+
When complete, `make install` will place several programs into
58+
`/usr/local/bin`: `rustc`, the Rust compiler; `rustdoc`, the
59+
API-documentation tool, and `rustpkg`, the Rust package manager and build system.
60+
61+
[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
62+
[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz
63+
[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe
8864

8965

9066
## License
@@ -95,3 +71,8 @@ BSD-like licenses.
9571

9672
See LICENSE-APACHE, LICENSE-MIT, and COPYRIGHT for details.
9773

74+
## More help
75+
76+
The [tutorial] is a good starting point.
77+
78+
[tutorial]: http://static.rust-lang.org/doc/tutorial.html

branches/try2/configure

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@ opt optimize 1 "build optimized rust code"
372372
opt optimize-cxx 1 "build optimized C++ code"
373373
opt optimize-llvm 1 "build optimized LLVM"
374374
opt debug 0 "build with extra debug fun"
375-
opt ratchet-bench 0 "ratchet benchmarks"
376375
opt fast-make 0 "use .gitmodules as timestamp for submodule deps"
377376
opt manage-submodules 1 "let the build manage the git submodules"
378377
opt mingw-cross 0 "cross-compile for win32 using mingw"
@@ -750,18 +749,18 @@ then
750749
cd ${CFG_SRC_DIR}
751750

752751
msg "git: submodule sync"
753-
"${CFG_GIT}" submodule sync
752+
"${CFG_GIT}" submodule --quiet sync
754753

755754
msg "git: submodule update"
756-
"${CFG_GIT}" submodule update --init
755+
"${CFG_GIT}" submodule --quiet update --init
757756
need_ok "git failed"
758757

759758
msg "git: submodule foreach sync"
760-
"${CFG_GIT}" submodule foreach --recursive 'if test -e .gitmodules; then git submodule sync; fi'
759+
"${CFG_GIT}" submodule --quiet foreach --recursive 'if test -e .gitmodules; then git submodule sync; fi'
761760
need_ok "git failed"
762761

763762
msg "git: submodule foreach update"
764-
"${CFG_GIT}" submodule update --init --recursive
763+
"${CFG_GIT}" submodule --quiet update --init --recursive
765764
need_ok "git failed"
766765

767766
# NB: this is just for the sake of getting the submodule SHA1 values
@@ -770,9 +769,9 @@ then
770769
"${CFG_GIT}" submodule status --recursive
771770

772771
msg "git: submodule clobber"
773-
"${CFG_GIT}" submodule foreach --recursive git clean -dxf
772+
"${CFG_GIT}" submodule --quiet foreach --recursive git clean -dxf
774773
need_ok "git failed"
775-
"${CFG_GIT}" submodule foreach --recursive git checkout .
774+
"${CFG_GIT}" submodule --quiet foreach --recursive git checkout .
776775
need_ok "git failed"
777776

778777
cd ${CFG_BUILD_DIR}
@@ -921,6 +920,9 @@ do
921920
esac
922921
need_ok "LLVM configure failed"
923922

923+
# Hack the tools Makefile to turn off the clang build
924+
sed -i 's/clang//g' tools/Makefile
925+
924926
cd $CFG_BUILD_DIR
925927
fi
926928

0 commit comments

Comments
 (0)