diff options
| author | bors <bors@rust-lang.org> | 2018-01-23 16:13:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-23 16:13:18 +0000 |
| commit | 4e3901d35f6a8652f67111e7272263c9e62ab3e1 (patch) | |
| tree | 1cb65ccb8e82d573d3c0d366da563cbe81b8cd1e /src/liballoc_jemalloc | |
| parent | 3a39b2aa5a68dd07aacab2106db3927f666a485a (diff) | |
| parent | 9707b3107612599f8f96facdcd8959669b630e02 (diff) | |
| download | rust-4e3901d35f6a8652f67111e7272263c9e62ab3e1.tar.gz rust-4e3901d35f6a8652f67111e7272263c9e62ab3e1.zip | |
Auto merge of #47678 - kennytm:rollup, r=kennytm
Rollup of 14 pull requests - Successful merges: #47423, #47425, #47440, #47541, #47549, #47554, #47558, #47610, #47635, #47655, #47661, #47662, #47667, #47672 - Failed merges:
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/build.rs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs index 440c9fbf2f6..0aa46dc6d20 100644 --- a/src/liballoc_jemalloc/build.rs +++ b/src/liballoc_jemalloc/build.rs @@ -29,13 +29,20 @@ 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("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") { + if target.contains("bitrig") || 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; } + // CloudABI ships with a copy of jemalloc that has been patched to + // work well with sandboxing. Don't attempt to build our own copy, + // as it won't build. + if target.contains("cloudabi") { + return; + } + if target.contains("android") { println!("cargo:rustc-link-lib=gcc"); } else if !target.contains("windows") && !target.contains("musl") { |
