diff options
| author | bors <bors@rust-lang.org> | 2016-03-07 13:46:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-07 13:46:11 +0000 |
| commit | 2f34986eb0f14b3ce5e17db577abc632a9176380 (patch) | |
| tree | d3f8fc1f011dfce23ec9b0d21cb5e4eb76d05995 /src/liballoc_jemalloc | |
| parent | e079afa00b58f06de8e2a7596073045cd0983b7b (diff) | |
| parent | f164433a11bda8b61276f501983462d5dac743aa (diff) | |
| download | rust-2f34986eb0f14b3ce5e17db577abc632a9176380.tar.gz rust-2f34986eb0f14b3ce5e17db577abc632a9176380.zip | |
Auto merge of #32078 - japaric:rustbuild-i686-musl, r=alexcrichton
- make sure we copy the third party objects (crt*.o) to the target stage directory. - apply the x86_64-musl logic also to the i686-musl target. --- r? @alexcrichton
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/build.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs index c9508322a31..9e2090c3246 100644 --- a/src/liballoc_jemalloc/build.rs +++ b/src/liballoc_jemalloc/build.rs @@ -111,7 +111,7 @@ fn main() { println!("cargo:rustc-link-search=native={}/lib", build_dir.display()); if target.contains("android") { println!("cargo:rustc-link-lib=gcc"); - } else if !target.contains("windows") { + } else if !target.contains("windows") && !target.contains("musl") { println!("cargo:rustc-link-lib=pthread"); } } |
