Skip to content

Commit a2be484

Browse files
steveklabniksteveklabnik
committed
---
yaml --- r: 233711 b: refs/heads/beta c: c4847a1 h: refs/heads/master i: 233709: bee9916 233707: 2142c99 233703: 411fed6 233695: 6ab30e9 v: v3
1 parent 0fa37f7 commit a2be484

File tree

753 files changed

+22994
-24309
lines changed

Some content is hidden

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

753 files changed

+22994
-24309
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 067ad9928f75c647a2088bef57ca75b71c809792
26+
refs/heads/beta: c4847a11dabf108c49ce2c035e44c0a8c32ac18c
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

‎branches/beta/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ hop on [#rust-internals][pound-rust-internals].
1717
As a reminder, all contributors are expected to follow our [Code of Conduct][coc].
1818

1919
[pound-rust-internals]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals
20-
[internals]: http://internals.rust-lang.org
21-
[coc]: http://www.rust-lang.org/conduct.html
20+
[internals]: https://internals.rust-lang.org
21+
[coc]: https://www.rust-lang.org/conduct.html
2222

2323
## Feature Requests
2424

@@ -207,6 +207,6 @@ it to [Crates.io](http://crates.io). Easier said than done, but very, very
207207
valuable!
208208

209209
[pound-rust]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust
210-
[users]: http://users.rust-lang.org/
210+
[users]: https://users.rust-lang.org/
211211
[so]: http://stackoverflow.com/questions/tagged/rust
212212
[community-library]: https://github.com/rust-lang/rfcs/labels/A-community-library

‎branches/beta/README.md

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ as standard libraries, tools and documentation for Rust.
1313

1414
Read ["Installing Rust"] from [The Book].
1515

16-
["Installing Rust"]: http://doc.rust-lang.org/book/installing-rust.html
17-
[The Book]: http://doc.rust-lang.org/book/index.html
16+
["Installing Rust"]: https://doc.rust-lang.org/book/installing-rust.html
17+
[The Book]: https://doc.rust-lang.org/book/index.html
1818

1919
## Building from Source
2020

@@ -82,6 +82,28 @@ Read ["Installing Rust"] from [The Book].
8282
$ make && make install
8383
```
8484

85+
## Building Documentation
86+
87+
If you’d like to build the documentation, it’s almost the same:
88+
89+
```sh
90+
./configure
91+
$ make docs
92+
```
93+
94+
Building the documentation requires building the compiler, so the above
95+
details will apply. Once you have the compiler built, you can
96+
97+
```sh
98+
$ make docs NO_REBUILD=1
99+
```
100+
101+
To make sure you don’t re-build the compiler because you made a change
102+
to some documentation.
103+
104+
The generated documentation will appear in a top-level `doc` directory,
105+
created by the `make` rule.
106+
85107
## Notes
86108

87109
Since the Rust compiler is written in Rust, it must be built by a
@@ -117,7 +139,7 @@ The Rust community congregates in a few places:
117139

118140
[Stack Overflow]: http://stackoverflow.com/questions/tagged/rust
119141
[/r/rust]: http://reddit.com/r/rust
120-
[users.rust-lang.org]: http://users.rust-lang.org/
142+
[users.rust-lang.org]: https://users.rust-lang.org/
121143

122144
## Contributing
123145

‎branches/beta/RELEASES.md

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -102,51 +102,51 @@ Misc
102102
* Fat pointers are now [passed in pairs of immediate arguments][fat],
103103
resulting in faster compile times and smaller code.
104104

105-
[`Extend`]: http://doc.rust-lang.org/nightly/std/iter/trait.Extend.html
105+
[`Extend`]: https://doc.rust-lang.org/nightly/std/iter/trait.Extend.html
106106
[extend-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0839-embrace-extend-extinguish.md
107-
[`iter::once`]: http://doc.rust-lang.org/nightly/std/iter/fn.once.html
108-
[`iter::empty`]: http://doc.rust-lang.org/nightly/std/iter/fn.empty.html
109-
[`matches`]: http://doc.rust-lang.org/nightly/std/primitive.str.html#method.matches
110-
[`rmatches`]: http://doc.rust-lang.org/nightly/std/primitive.str.html#method.rmatches
111-
[`Cell`]: http://doc.rust-lang.org/nightly/std/cell/struct.Cell.html
112-
[`RefCell`]: http://doc.rust-lang.org/nightly/std/cell/struct.RefCell.html
113-
[`wrapping_add`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_add
114-
[`wrapping_sub`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_sub
115-
[`wrapping_mul`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_mul
116-
[`wrapping_div`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_div
117-
[`wrapping_rem`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_rem
118-
[`wrapping_neg`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_neg
119-
[`wrapping_shl`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_shl
120-
[`wrapping_shr`]: http://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_shr
121-
[`Wrapping`]: http://doc.rust-lang.org/nightly/std/num/struct.Wrapping.html
122-
[`fmt::Formatter`]: http://doc.rust-lang.org/nightly/std/fmt/struct.Formatter.html
123-
[`fmt::Write`]: http://doc.rust-lang.org/nightly/std/fmt/trait.Write.html
124-
[`io::Write`]: http://doc.rust-lang.org/nightly/std/io/trait.Write.html
125-
[`debug_struct`]: http://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_struct
126-
[`debug_tuple`]: http://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_tuple
127-
[`debug_list`]: http://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_list
128-
[`debug_set`]: http://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_set
129-
[`debug_map`]: http://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_map
130-
[`Debug`]: http://doc.rust-lang.org/nightly/std/fmt/trait.Debug.html
131-
[strup]: http://doc.rust-lang.org/nightly/std/primitive.str.html#method.to_uppercase
132-
[strlow]: http://doc.rust-lang.org/nightly/std/primitive.str.html#method.to_lowercase
133-
[`to_uppercase`]: http://doc.rust-lang.org/nightly/std/primitive.char.html#method.to_uppercase
134-
[`to_lowercase`]: http://doc.rust-lang.org/nightly/std/primitive.char.html#method.to_lowercase
135-
[`PoisonError`]: http://doc.rust-lang.org/nightly/std/sync/struct.PoisonError.html
136-
[`RwLock`]: http://doc.rust-lang.org/nightly/std/sync/struct.RwLock.html
137-
[`Mutex`]: http://doc.rust-lang.org/nightly/std/sync/struct.Mutex.html
138-
[`FromRawFd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.FromRawFd.html
139-
[`AsRawFd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.AsRawFd.html
140-
[`Stdio`]: http://doc.rust-lang.org/nightly/std/process/struct.Stdio.html
141-
[`ChildStdin`]: http://doc.rust-lang.org/nightly/std/process/struct.ChildStdin.html
142-
[`ChildStdout`]: http://doc.rust-lang.org/nightly/std/process/struct.ChildStdout.html
143-
[`ChildStderr`]: http://doc.rust-lang.org/nightly/std/process/struct.ChildStderr.html
144-
[`io::ErrorKind`]: http://doc.rust-lang.org/nightly/std/io/enum.ErrorKind.html
107+
[`iter::once`]: https://doc.rust-lang.org/nightly/std/iter/fn.once.html
108+
[`iter::empty`]: https://doc.rust-lang.org/nightly/std/iter/fn.empty.html
109+
[`matches`]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.matches
110+
[`rmatches`]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.rmatches
111+
[`Cell`]: https://doc.rust-lang.org/nightly/std/cell/struct.Cell.html
112+
[`RefCell`]: https://doc.rust-lang.org/nightly/std/cell/struct.RefCell.html
113+
[`wrapping_add`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_add
114+
[`wrapping_sub`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_sub
115+
[`wrapping_mul`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_mul
116+
[`wrapping_div`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_div
117+
[`wrapping_rem`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_rem
118+
[`wrapping_neg`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_neg
119+
[`wrapping_shl`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_shl
120+
[`wrapping_shr`]: https://doc.rust-lang.org/nightly/std/primitive.i8.html#method.wrapping_shr
121+
[`Wrapping`]: https://doc.rust-lang.org/nightly/std/num/struct.Wrapping.html
122+
[`fmt::Formatter`]: https://doc.rust-lang.org/nightly/std/fmt/struct.Formatter.html
123+
[`fmt::Write`]: https://doc.rust-lang.org/nightly/std/fmt/trait.Write.html
124+
[`io::Write`]: https://doc.rust-lang.org/nightly/std/io/trait.Write.html
125+
[`debug_struct`]: https://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_struct
126+
[`debug_tuple`]: https://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_tuple
127+
[`debug_list`]: https://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_list
128+
[`debug_set`]: https://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_set
129+
[`debug_map`]: https://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.debug_map
130+
[`Debug`]: https://doc.rust-lang.org/nightly/std/fmt/trait.Debug.html
131+
[strup]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.to_uppercase
132+
[strlow]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.to_lowercase
133+
[`to_uppercase`]: https://doc.rust-lang.org/nightly/std/primitive.char.html#method.to_uppercase
134+
[`to_lowercase`]: https://doc.rust-lang.org/nightly/std/primitive.char.html#method.to_lowercase
135+
[`PoisonError`]: https://doc.rust-lang.org/nightly/std/sync/struct.PoisonError.html
136+
[`RwLock`]: https://doc.rust-lang.org/nightly/std/sync/struct.RwLock.html
137+
[`Mutex`]: https://doc.rust-lang.org/nightly/std/sync/struct.Mutex.html
138+
[`FromRawFd`]: https://doc.rust-lang.org/nightly/std/os/unix/io/trait.FromRawFd.html
139+
[`AsRawFd`]: https://doc.rust-lang.org/nightly/std/os/unix/io/trait.AsRawFd.html
140+
[`Stdio`]: https://doc.rust-lang.org/nightly/std/process/struct.Stdio.html
141+
[`ChildStdin`]: https://doc.rust-lang.org/nightly/std/process/struct.ChildStdin.html
142+
[`ChildStdout`]: https://doc.rust-lang.org/nightly/std/process/struct.ChildStdout.html
143+
[`ChildStderr`]: https://doc.rust-lang.org/nightly/std/process/struct.ChildStderr.html
144+
[`io::ErrorKind`]: https://doc.rust-lang.org/nightly/std/io/enum.ErrorKind.html
145145
[debugfmt]: https://www.reddit.com/r/rust/comments/3ceaui/psa_produces_prettyprinted_debug_output/
146-
[`DerefMut`]: http://doc.rust-lang.org/nightly/std/ops/trait.DerefMut.html
147-
[`mem::align_of`]: http://doc.rust-lang.org/nightly/std/mem/fn.align_of.html
146+
[`DerefMut`]: https://doc.rust-lang.org/nightly/std/ops/trait.DerefMut.html
147+
[`mem::align_of`]: https://doc.rust-lang.org/nightly/std/mem/fn.align_of.html
148148
[align]: https://github.com/rust-lang/rust/pull/25646
149-
[`mem::min_align_of`]: http://doc.rust-lang.org/nightly/std/mem/fn.min_align_of.html
149+
[`mem::min_align_of`]: https://doc.rust-lang.org/nightly/std/mem/fn.min_align_of.html
150150
[typos]: https://github.com/rust-lang/rust/pull/26087
151151
[nop]: https://github.com/rust-lang/rust/pull/26336
152152
[fat]: https://github.com/rust-lang/rust/pull/26411
@@ -237,14 +237,14 @@ Misc
237237
* [The `drop_with_repr_extern` lint warns about mixing `repr(C)`
238238
with `Drop`][drop].
239239

240-
[`str::split_whitespace`]: http://doc.rust-lang.org/nightly/std/primitive.str.html#method.split_whitespace
241-
[`FromRawFd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.FromRawFd.html
242-
[`AsRawFd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.AsRawFd.html
243-
[`std::os::unix::symlink`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/fn.symlink.html
244-
[`IntoIterator`]: http://doc.rust-lang.org/nightly/std/iter/trait.IntoIterator.html
245-
[`From`]: http://doc.rust-lang.org/nightly/std/convert/trait.From.html
240+
[`str::split_whitespace`]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.split_whitespace
241+
[`FromRawFd`]: https://doc.rust-lang.org/nightly/std/os/unix/io/trait.FromRawFd.html
242+
[`AsRawFd`]: https://doc.rust-lang.org/nightly/std/os/unix/io/trait.AsRawFd.html
243+
[`std::os::unix::symlink`]: https://doc.rust-lang.org/nightly/std/os/unix/fs/fn.symlink.html
244+
[`IntoIterator`]: https://doc.rust-lang.org/nightly/std/iter/trait.IntoIterator.html
245+
[`From`]: https://doc.rust-lang.org/nightly/std/convert/trait.From.html
246246
[rf]: https://github.com/rust-lang/rust/pull/24491
247-
[err-index]: http://doc.rust-lang.org/error-index.html
247+
[err-index]: https://doc.rust-lang.org/error-index.html
248248
[sk]: https://github.com/rust-lang/rust/pull/24615
249249
[pre]: https://github.com/rust-lang/rust/pull/25323
250250
[file]: https://github.com/rust-lang/rust/pull/24598
@@ -258,13 +258,13 @@ Misc
258258
[pie]: https://github.com/rust-lang/rust/pull/24953
259259
[abs]: https://github.com/rust-lang/rust/pull/25441
260260
[c]: https://github.com/rust-lang/rust/pull/25496
261-
[`Cloned`]: http://doc.rust-lang.org/nightly/std/iter/struct.Cloned.html
262-
[`Incoming`]: http://doc.rust-lang.org/nightly/std/net/struct.Incoming.html
261+
[`Cloned`]: https://doc.rust-lang.org/nightly/std/iter/struct.Cloned.html
262+
[`Incoming`]: https://doc.rust-lang.org/nightly/std/net/struct.Incoming.html
263263
[inc]: https://github.com/rust-lang/rust/pull/25522
264264
[bh]: https://github.com/rust-lang/rust/pull/25856
265-
[`BinaryHeap`]: http://doc.rust-lang.org/nightly/std/collections/struct.BinaryHeap.html
265+
[`BinaryHeap`]: https://doc.rust-lang.org/nightly/std/collections/struct.BinaryHeap.html
266266
[ll]: https://github.com/rust-lang/rust/pull/26022
267-
[`split_off`]: http://doc.rust-lang.org/nightly/collections/linked_list/struct.LinkedList.html#method.split_off
267+
[`split_off`]: https://doc.rust-lang.org/nightly/collections/linked_list/struct.LinkedList.html#method.split_off
268268
[drop]: https://github.com/rust-lang/rust/pull/24935
269269

270270
Version 1.0.0 (May 2015)
@@ -508,7 +508,7 @@ Version 1.0.0-alpha.2 (February 2015)
508508
[drop]: https://github.com/rust-lang/rust/pull/21972
509509
[drop-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0769-sound-generic-drop.md
510510
[feat]: https://github.com/rust-lang/rust/pull/21248
511-
[feat-forum]: http://users.rust-lang.org/t/psa-important-info-about-rustcs-new-feature-staging/82/5
511+
[feat-forum]: https://users.rust-lang.org/t/psa-important-info-about-rustcs-new-feature-staging/82/5
512512
[feat-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0507-release-channels.md
513513
[fmt]: https://github.com/rust-lang/rust/pull/21457
514514
[into]: https://github.com/rust-lang/rust/pull/20790
@@ -709,7 +709,7 @@ Version 1.0.0-alpha (January 2015)
709709
[objsafe]: https://github.com/rust-lang/rfcs/blob/master/text/0255-object-safety.md
710710
[assoc]: https://github.com/rust-lang/rfcs/blob/master/text/0195-associated-items.md
711711
[ints]: https://github.com/rust-lang/rfcs/pull/544#issuecomment-68760871
712-
[trpl]: http://doc.rust-lang.org/book/index.html
712+
[trpl]: https://doc.rust-lang.org/book/index.html
713713
[rbe]: http://rustbyexample.com/
714714

715715

‎branches/beta/configure

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,11 +602,16 @@ valopt python "" "set path to python"
602602
valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located"
603603
valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"
604604
valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path (deprecated)"
605+
valopt i686-linux-android-ndk "" "i686-linux-android NDK standalone path"
605606
valopt arm-linux-androideabi-ndk "" "arm-linux-androideabi NDK standalone path"
606607
valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path"
607608
valopt release-channel "dev" "the name of the release channel to build"
608609
valopt musl-root "/usr/local" "MUSL root installation directory"
609610

611+
# Used on systems where "cc" and "ar" are unavailable
612+
valopt default-linker "cc" "the default linker"
613+
valopt default-ar "ar" "the default ar"
614+
610615
# Many of these are saved below during the "writing configuration" step
611616
# (others are conditionally saved).
612617
opt_nosave manage-submodules 1 "let the build manage the git submodules"
@@ -1428,9 +1433,10 @@ do
14281433
LLVM_BUILD_DIR=
14291434
LLVM_INST_DIR=$CFG_LLVM_ROOT
14301435
do_reconfigure=0
1436+
# Check that LLVm FileCheck is available. Needed for the tests
1437+
need_cmd $LLVM_INST_DIR/bin/FileCheck
14311438
fi
14321439

1433-
14341440
if [ ${do_reconfigure} -ne 0 ]
14351441
then
14361442
# because git is hilarious, it might have put the module index
@@ -1688,6 +1694,7 @@ putvar CFG_LIBDIR_RELATIVE
16881694
putvar CFG_DISABLE_MANAGE_SUBMODULES
16891695
putvar CFG_AARCH64_LINUX_ANDROID_NDK
16901696
putvar CFG_ARM_LINUX_ANDROIDEABI_NDK
1697+
putvar CFG_I686_LINUX_ANDROID_NDK
16911698
putvar CFG_MANDIR
16921699

16931700
# Avoid spurious warnings from clang by feeding it original source on

‎branches/beta/man/rustc.1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ look for anything here (the default)
4141
.RE
4242
.TP
4343
\fB\-l\fR [\fIKIND\fR=]\fINAME\fR
44-
Link the generated crate(s) to the specified native library \fINAME\fR.
44+
Link the generated crate(s) to the specified library \fINAME\fR.
4545
The optional \fIKIND\fR can be one of \fIstatic\fR, \fIdylib\fR, or
4646
\fIframework\fR.
4747
If omitted, \fIdylib\fR is assumed.
@@ -113,7 +113,8 @@ Print version info and exit.
113113
Use verbose output.
114114
.TP
115115
\fB\-\-extern\fR \fINAME\fR=\fIPATH\fR
116-
Specify where an external rust library is located.
116+
Specify where an external rust library is located. These should match
117+
\fIextern\fR declarations in the crate's source code.
117118
.TP
118119
\fB\-\-sysroot\fR \fIPATH\fR
119120
Override the system root.

‎branches/beta/mk/cfg/i686-linux-android.mk

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# i686-linux-android configuration
2+
CC_i686-linux-android=$(CFG_I686_LINUX_ANDROID_NDK)/bin/i686-linux-android-gcc
3+
CXX_i686-linux-android=$(CFG_I686_LINUX_ANDROID_NDK)/bin/i686-linux-android-g++
4+
CPP_i686-linux-android=$(CFG_I686_LINUX_ANDROID_NDK)/bin/i686-linux-android-gcc -E
5+
AR_i686-linux-android=$(CFG_I686_LINUX_ANDROID_NDK)/bin/i686-linux-android-ar
6+
CFG_LIB_NAME_i686-linux-android=lib$(1).so
7+
CFG_STATIC_LIB_NAME_i686-linux-android=lib$(1).a
8+
CFG_LIB_GLOB_i686-linux-android=lib$(1)-*.so
9+
CFG_LIB_DSYM_GLOB_i686-linux-android=lib$(1)-*.dylib.dSYM
10+
CFG_JEMALLOC_CFLAGS_i686-linux-android := -D__i686__ -DANDROID -D__ANDROID__ $(CFLAGS)
11+
CFG_GCCISH_CFLAGS_i686-linux-android := -Wall -g -fPIC -D__i686__ -DANDROID -D__ANDROID__ $(CFLAGS)
12+
CFG_GCCISH_CXXFLAGS_i686-linux-android := -fno-rtti $(CXXFLAGS)
13+
CFG_GCCISH_LINK_FLAGS_i686-linux-android := -shared -fPIC -ldl -g -lm -lsupc++
14+
CFG_GCCISH_DEF_FLAG_i686-linux-android := -Wl,--export-dynamic,--dynamic-list=
15+
CFG_LLC_FLAGS_i686-linux-android :=
16+
CFG_INSTALL_NAME_i686-linux-android =
17+
CFG_EXE_SUFFIX_i686-linux-android :=
18+
CFG_WINDOWSY_i686-linux-android :=
19+
CFG_UNIXY_i686-linux-android := 1
20+
CFG_LDPATH_i686-linux-android :=
21+
CFG_RUN_i686-linux-android=
22+
CFG_RUN_TARG_i686-linux-android=
23+
RUSTC_FLAGS_i686-linux-android :=
24+
RUSTC_CROSS_FLAGS_i686-linux-android :=
25+
CFG_GNU_TRIPLE_i686-linux-android := i686-linux-android

‎branches/beta/mk/cfg/i686-pc-windows-msvc.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,3 @@ CFG_LDPATH_i686-pc-windows-msvc :=
2222
CFG_RUN_i686-pc-windows-msvc=$(2)
2323
CFG_RUN_TARG_i686-pc-windows-msvc=$(call CFG_RUN_i686-pc-windows-msvc,,$(2))
2424
CFG_GNU_TRIPLE_i686-pc-windows-msvc := i686-pc-win32
25-
26-
# All windows nightiles are currently a GNU triple, so this MSVC triple is not
27-
# bootstrapping from itself. This is relevant during stage0, and other parts of
28-
# the build system take this into account.
29-
BOOTSTRAP_FROM_i686-pc-windows-msvc := i686-pc-windows-gnu

‎branches/beta/mk/cfg/x86_64-pc-windows-msvc.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,3 @@ CFG_LDPATH_x86_64-pc-windows-msvc :=
2222
CFG_RUN_x86_64-pc-windows-msvc=$(2)
2323
CFG_RUN_TARG_x86_64-pc-windows-msvc=$(call CFG_RUN_x86_64-pc-windows-msvc,,$(2))
2424
CFG_GNU_TRIPLE_x86_64-pc-windows-msvc := x86_64-pc-win32
25-
26-
# All windows nightiles are currently a GNU triple, so this MSVC triple is not
27-
# bootstrapping from itself. This is relevant during stage0, and other parts of
28-
# the build system take this into account.
29-
BOOTSTRAP_FROM_x86_64-pc-windows-msvc := x86_64-pc-windows-gnu

0 commit comments

Comments
 (0)