Skip to content

Commit a0eeb8e

Browse files
borsbors
committed
---
yaml --- r: 232443 b: refs/heads/try c: 2f60268 h: refs/heads/master i: 232441: dbd9f72 232439: af819e7 v: v3
1 parent 1c6b36e commit a0eeb8e

File tree

550 files changed

+14113
-19316
lines changed

Some content is hidden

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

550 files changed

+14113
-19316
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: d17d2dd48e7f6baabfdeeef567b79013caec1a01
4+
refs/heads/try: 2f60268f54e6e8dd6313d1898f5d846d3e5332af
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try/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/try/README.md

Lines changed: 3 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

@@ -117,7 +117,7 @@ The Rust community congregates in a few places:
117117

118118
[Stack Overflow]: http://stackoverflow.com/questions/tagged/rust
119119
[/r/rust]: http://reddit.com/r/rust
120-
[users.rust-lang.org]: http://users.rust-lang.org/
120+
[users.rust-lang.org]: https://users.rust-lang.org/
121121

122122
## Contributing
123123

‎branches/try/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/try/configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1428,9 +1428,10 @@ do
14281428
LLVM_BUILD_DIR=
14291429
LLVM_INST_DIR=$CFG_LLVM_ROOT
14301430
do_reconfigure=0
1431+
# Check that LLVm FileCheck is available. Needed for the tests
1432+
need_cmd $LLVM_INST_DIR/bin/FileCheck
14311433
fi
14321434

1433-
14341435
if [ ${do_reconfigure} -ne 0 ]
14351436
then
14361437
# because git is hilarious, it might have put the module index

‎branches/try/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/try/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

‎branches/try/mk/crates.mk

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,23 @@
5252
TARGET_CRATES := libc std flate arena term \
5353
serialize getopts collections test rand \
5454
log graphviz core rbml alloc \
55-
rustc_unicode rustc_bitflags
55+
rustc_unicode rustc_bitflags \
56+
alloc_system
5657
RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
5758
rustc_trans rustc_back rustc_llvm rustc_privacy rustc_lint \
5859
rustc_data_structures
5960
HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc fmt_macros
60-
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
6161
TOOLS := compiletest rustdoc rustc rustbook error-index-generator
6262

6363
DEPS_core :=
6464
DEPS_libc := core
6565
DEPS_rustc_unicode := core
66-
DEPS_alloc := core libc native:jemalloc
66+
DEPS_alloc := core libc alloc_system
6767
DEPS_std := core libc rand alloc collections rustc_unicode \
6868
native:rust_builtin native:backtrace \
69-
rustc_bitflags
69+
alloc_system
7070
DEPS_graphviz := std
71-
DEPS_syntax := std term serialize log fmt_macros arena libc
71+
DEPS_syntax := std term serialize log fmt_macros arena libc rustc_bitflags
7272
DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
7373
rustc_typeck rustc_resolve log syntax serialize rustc_llvm \
7474
rustc_trans rustc_privacy rustc_lint
@@ -82,7 +82,7 @@ DEPS_rustc_privacy := rustc log syntax
8282
DEPS_rustc_lint := rustc log syntax
8383
DEPS_rustc := syntax flate arena serialize getopts rbml \
8484
log graphviz rustc_llvm rustc_back rustc_data_structures
85-
DEPS_rustc_llvm := native:rustllvm libc std
85+
DEPS_rustc_llvm := native:rustllvm libc std rustc_bitflags
8686
DEPS_rustc_back := std syntax rustc_llvm flate log libc
8787
DEPS_rustc_data_structures := std log serialize
8888
DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
@@ -102,6 +102,7 @@ DEPS_test := std getopts serialize rbml term native:rust_test_helpers
102102
DEPS_rand := core
103103
DEPS_log := std
104104
DEPS_fmt_macros = std
105+
DEPS_alloc_system := core libc
105106

106107
TOOL_DEPS_compiletest := test getopts
107108
TOOL_DEPS_rustdoc := rustdoc
@@ -121,14 +122,26 @@ ONLY_RLIB_rand := 1
121122
ONLY_RLIB_collections := 1
122123
ONLY_RLIB_rustc_unicode := 1
123124
ONLY_RLIB_rustc_bitflags := 1
125+
ONLY_RLIB_alloc_system := 1
124126

125127
# Documented-by-default crates
126128
DOC_CRATES := std alloc collections core libc rustc_unicode
127129

130+
ifeq ($(CFG_DISABLE_JEMALLOC),)
131+
TARGET_CRATES += alloc_jemalloc
132+
DEPS_std += alloc_jemalloc
133+
DEPS_alloc_jemalloc := core libc native:jemalloc
134+
ONLY_RLIB_alloc_jemalloc := 1
135+
else
136+
RUSTFLAGS_rustc_back := --cfg disable_jemalloc
137+
endif
138+
128139
################################################################################
129140
# You should not need to edit below this line
130141
################################################################################
131142

143+
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
144+
132145
# This macro creates some simple definitions for each crate being built, just
133146
# some munging of all of the parameters above.
134147
#

0 commit comments

Comments
 (0)