about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2014-05-11 00:54:41 -0400
committerDaniel Micay <danielmicay@gmail.com>2014-05-11 00:57:41 -0400
commit81fadbbc4182c5a34e0d2ff698471abfc1ec0e33 (patch)
tree770b50ee78ec3b79feeaf70f73f50f1166bed980 /src/libstd
parente2479b8cac0e4f5822e768f8ee8c735e87702712 (diff)
downloadrust-81fadbbc4182c5a34e0d2ff698471abfc1ec0e33.tar.gz
rust-81fadbbc4182c5a34e0d2ff698471abfc1ec0e33.zip
android workaround
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/rt/heap.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/rt/heap.rs b/src/libstd/rt/heap.rs
index 30583f76330..ffe6dccfa15 100644
--- a/src/libstd/rt/heap.rs
+++ b/src/libstd/rt/heap.rs
@@ -25,7 +25,7 @@ extern {
 }
 
 // -lpthread needs to occur after -ljemalloc, the earlier argument isn't enough
-#[cfg(not(windows))]
+#[cfg(not(windows), not(target_os = "android"))]
 #[link(name = "pthread")]
 extern {}