Skip to content

Commit bcf920f

Browse files
committed
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.
2 parents 96d1334 + c811915 commit bcf920f

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/bootstrap/compile.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ pub fn std_cargo(builder: &Builder,
155155
cargo
156156
.args(&["-p", "alloc"])
157157
.arg("--manifest-path")
158-
.arg(builder.src.join("src/liballoc/Cargo.toml"));
158+
.arg(builder.src.join("src/liballoc/Cargo.toml"))
159+
.arg("--features")
160+
.arg("compiler-builtins-mem");
159161
} else {
160162
let features = builder.std_features();
161163

src/liballoc/Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@ path = "../liballoc/benches/lib.rs"
2828
name = "vec_deque_append_bench"
2929
path = "../liballoc/benches/vec_deque_append.rs"
3030
harness = false
31+
32+
[features]
33+
compiler-builtins-mem = ['compiler_builtins/mem']

0 commit comments

Comments
 (0)