diff options
| author | Jorge Aparicio <japaricious@gmail.com> | 2016-03-06 08:19:51 -0500 |
|---|---|---|
| committer | Jorge Aparicio <japaricious@gmail.com> | 2016-03-06 08:19:51 -0500 |
| commit | 0b7fc0653bfd19f650a2fbad987b2fe03715e6b4 (patch) | |
| tree | 5d778f54cf1fa06d0382944ed47a68a93c74367f /src/liballoc_jemalloc | |
| parent | c116ae35cf49b55bd8d82e31f1ba030cf7e63867 (diff) | |
| download | rust-0b7fc0653bfd19f650a2fbad987b2fe03715e6b4.tar.gz rust-0b7fc0653bfd19f650a2fbad987b2fe03715e6b4.zip | |
rustbuild: fix cross compilation of libstd to i686-unknown-linux-musl
- 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.
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"); } } |
