From c811915eafb349759d2bba9d7a39a53aef02bb3d Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 14 Dec 2018 09:05:31 -0800 Subject: [PATCH] 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. --- src/bootstrap/compile.rs | 4 +++- src/liballoc/Cargo.toml | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index c84abe42a6372..689d0530f8b24 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -155,7 +155,9 @@ pub fn std_cargo(builder: &Builder, cargo .args(&["-p", "alloc"]) .arg("--manifest-path") - .arg(builder.src.join("src/liballoc/Cargo.toml")); + .arg(builder.src.join("src/liballoc/Cargo.toml")) + .arg("--features") + .arg("compiler-builtins-mem"); } else { let features = builder.std_features(); diff --git a/src/liballoc/Cargo.toml b/src/liballoc/Cargo.toml index b7faee1bc7da4..b2eb3566c04a7 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']