about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-15 00:50:19 +0000
committerbors <bors@rust-lang.org>2018-12-15 00:50:19 +0000
commitbcf920fc2707c3f126a2963a686ed800eeea49e6 (patch)
tree83603bff57d7cfd36d9ecc8b1358924485b38685 /src/liballoc
parent96d1334e567237b1507cd277938e7ae2de75ff51 (diff)
parentc811915eafb349759d2bba9d7a39a53aef02bb3d (diff)
downloadrust-bcf920fc2707c3f126a2963a686ed800eeea49e6.tar.gz
rust-bcf920fc2707c3f126a2963a686ed800eeea49e6.zip
Auto merge of #56825 - alexcrichton:demangle-mem, r=nikomatsakis
std: Activate compiler_builtins `mem` feature for no_std targets

This was an accidental regression from #56092, but for `no_std` targets
being built and distributed we want to be sure to activate the
compiler-builtins `mem` feature which demangles important memory-related
intrinsics.
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/Cargo.toml3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/liballoc/Cargo.toml b/src/liballoc/Cargo.toml
index b7faee1bc7d..b2eb3566c04 100644
--- a/src/liballoc/Cargo.toml
+++ b/src/liballoc/Cargo.toml
@@ -28,3 +28,6 @@ path = "../liballoc/benches/lib.rs"
 name = "vec_deque_append_bench"
 path = "../liballoc/benches/vec_deque_append.rs"
 harness = false
+
+[features]
+compiler-builtins-mem = ['compiler_builtins/mem']