about summary refs log tree commit diff
path: root/src/liballoc_jemalloc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-10-24 13:31:29 -0700
committerGitHub <noreply@github.com>2016-10-24 13:31:29 -0700
commit3caf63cc00f5cec580954bdb117f4fa756cc757d (patch)
tree265134910df7fecafce5d3869e13f245dc8b5113 /src/liballoc_jemalloc
parent7bd2427307018a68e0b77438bbe40d339a54e587 (diff)
parentcea61408c335826a0e3fcd781ac5d05ae5ad432e (diff)
downloadrust-3caf63cc00f5cec580954bdb117f4fa756cc757d.tar.gz
rust-3caf63cc00f5cec580954bdb117f4fa756cc757d.zip
Auto merge of #37313 - raphlinus:fuchsia, r=alexcrichton
Add Fuchsia support

Adds support for the x86_64-unknown-fuchsia target, which covers the
Fuchsia operating system.
Diffstat (limited to 'src/liballoc_jemalloc')
-rw-r--r--src/liballoc_jemalloc/build.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs
index 369db8e75a3..08a1f8ae8c6 100644
--- a/src/liballoc_jemalloc/build.rs
+++ b/src/liballoc_jemalloc/build.rs
@@ -36,7 +36,7 @@ fn main() {
     // targets, which means we have to build the alloc_jemalloc crate
     // for targets like emscripten, even if we don't use it.
     if target.contains("rumprun") || target.contains("bitrig") || target.contains("openbsd") ||
-       target.contains("msvc") || target.contains("emscripten") {
+       target.contains("msvc") || target.contains("emscripten") || target.contains("fuchsia") {
         println!("cargo:rustc-cfg=dummy_jemalloc");
         return;
     }