Skip to content

Commit

Permalink
Auto merge of #47072 - EdSchouten:cloudabi-jemalloc, r=kennytm
Browse files Browse the repository at this point in the history
Add CloudABI to the list of systems on which we stub out alloc_jemalloc.

The official jemalloc sources don't build cleanly on CloudABI yet, for
the reason that some of its tracing frameworks try to access the global
filesystem namespace, which CloudABI doesn't provide.

Always make use of the malloc implementation used by the C library,
which already happens to be jemalloc with some tiny build fixes.
  • Loading branch information
bors committed Dec 31, 2017
2 parents 8c59418 + df0a2e4 commit 9389e23
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/liballoc_jemalloc/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ fn main() {
// for targets like emscripten, even if we don't use it.
let target = env::var("TARGET").expect("TARGET was not set");
let host = env::var("HOST").expect("HOST was not set");
if target.contains("rumprun") || target.contains("bitrig") || target.contains("openbsd") ||
target.contains("msvc") || target.contains("emscripten") || target.contains("fuchsia") ||
target.contains("redox") || target.contains("wasm32") {
if target.contains("bitrig") || target.contains("cloudabi") || target.contains("emscripten") ||
target.contains("fuchsia") || target.contains("msvc") || target.contains("openbsd") ||
target.contains("redox") || target.contains("rumprun") || target.contains("wasm32") {
println!("cargo:rustc-cfg=dummy_jemalloc");
return;
}
Expand Down

0 comments on commit 9389e23

Please sign in to comment.