diff options
| author | bors <bors@rust-lang.org> | 2017-02-08 03:55:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-08 03:55:13 +0000 |
| commit | 10f6a5c4431e09d355a0ba319a630e02a1e38361 (patch) | |
| tree | 5a5240b8b3467d3a03b7bdfd407d6c9513464124 /src/liballoc_jemalloc | |
| parent | c14f87e3b0823407a91a283796bf78ef83d5fe99 (diff) | |
| parent | 0a815ac816b7222554aa20b53c5fb01aa1f62616 (diff) | |
| download | rust-10f6a5c4431e09d355a0ba319a630e02a1e38361.tar.gz rust-10f6a5c4431e09d355a0ba319a630e02a1e38361.zip | |
Auto merge of #39638 - frewsxcv:rollup, r=frewsxcv
Rollup of 13 pull requests - Successful merges: #38764, #39361, #39372, #39374, #39400, #39426, #39431, #39459, #39482, #39545, #39593, #39620, #39621 - Failed merges:
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/build.rs | 1 | ||||
| -rw-r--r-- | src/liballoc_jemalloc/lib.rs | 16 |
2 files changed, 0 insertions, 17 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs index cb7852995f3..a3402bf3994 100644 --- a/src/liballoc_jemalloc/build.rs +++ b/src/liballoc_jemalloc/build.rs @@ -21,7 +21,6 @@ use std::process::Command; use build_helper::{run, rerun_if_changed_anything_in_dir, up_to_date}; fn main() { - println!("cargo:rustc-cfg=cargobuild"); println!("cargo:rerun-if-changed=build.rs"); // FIXME: This is a hack to support building targets that don't diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs index fc8a5455d1d..8d81a09f5af 100644 --- a/src/liballoc_jemalloc/lib.rs +++ b/src/liballoc_jemalloc/lib.rs @@ -30,22 +30,6 @@ pub use imp::*; mod imp { use libc::{c_int, c_void, size_t}; - // Linkage directives to pull in jemalloc and its dependencies. - // - // On some platforms we need to be sure to link in `pthread` which jemalloc - // depends on, and specifically on android we need to also link to libgcc. - // Currently jemalloc is compiled with gcc which will generate calls to - // intrinsics that are libgcc specific (e.g. those intrinsics aren't present in - // libcompiler-rt), so link that in to get that support. - #[link(name = "jemalloc", kind = "static")] - #[cfg_attr(target_os = "android", link(name = "gcc"))] - #[cfg_attr(all(not(windows), - not(target_os = "android"), - not(target_env = "musl")), - link(name = "pthread"))] - #[cfg(not(cargobuild))] - extern "C" {} - // Note that the symbols here are prefixed by default on OSX and Windows (we // don't explicitly request it), and on Android and DragonFly we explicitly // request it as unprefixing cause segfaults (mismatches in allocators). |