diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-04-21 15:56:55 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-04-27 10:11:15 -0700 |
| commit | 6c048723f83fad6c96c2e19d6dfa1db547371c11 (patch) | |
| tree | f73cdb4b5a30c302af48c94fc30f126e5d734364 /src/liballoc | |
| parent | d09851730c47f49555c84b76dd6e71d91b0555ed (diff) | |
| download | rust-6c048723f83fad6c96c2e19d6dfa1db547371c11.tar.gz rust-6c048723f83fad6c96c2e19d6dfa1db547371c11.zip | |
std: Prepare for linking to musl
This commit modifies the standard library and its dependencies to link correctly when built against MUSL. This primarily ensures that the right libraries are linked against and when they're linked against they're linked against statically.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/heap.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs index 9d1d8a7ac24..86a04a0687a 100644 --- a/src/liballoc/heap.rs +++ b/src/liballoc/heap.rs @@ -211,7 +211,9 @@ mod imp { } // -lpthread needs to occur after -ljemalloc, the earlier argument isn't enough - #[cfg(all(not(windows), not(target_os = "android")))] + #[cfg(all(not(windows), + not(target_os = "android"), + not(target_env = "musl")))] #[link(name = "pthread")] extern {} |