about summary refs log tree commit diff
path: root/src/liballoc_jemalloc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-12-31 19:25:05 +0000
committerbors <bors@rust-lang.org>2017-12-31 19:25:05 +0000
commit9389e23a8a754097e233c7bf3ea1bb404ccf1075 (patch)
tree4c37a1f71cc43abc8a90e1e29a01abc988feea3c /src/liballoc_jemalloc
parent8c5941896248802d57e73a1fc9adbca5869f1fa1 (diff)
parentdf0a2e440e1c871aa8a7f38148ad74eed9b3539b (diff)
downloadrust-9389e23a8a754097e233c7bf3ea1bb404ccf1075.tar.gz
rust-9389e23a8a754097e233c7bf3ea1bb404ccf1075.zip
Auto merge of #47072 - EdSchouten:cloudabi-jemalloc, r=kennytm
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.
Diffstat (limited to 'src/liballoc_jemalloc')
-rw-r--r--src/liballoc_jemalloc/build.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs
index 649cd6e8e85..440c9fbf2f6 100644
--- a/src/liballoc_jemalloc/build.rs
+++ b/src/liballoc_jemalloc/build.rs
@@ -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;
     }