---

thestinger · thestinger · commit de0510aa8b29 · 2014-05-11T00:57:41.000-04:00
yaml --- r: 113996 b: refs/heads/master c: 81fadbb h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e2479b8cac0e4f5822e768f8ee8c735e87702712
+refs/heads/master: 81fadbbc4182c5a34e0d2ff698471abfc1ec0e33
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
 refs/heads/try: 7c6c492fb2af9a85f21ff952942df3523b22fd17
diff --git a/trunk/src/libstd/rt/heap.rs b/trunk/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 {}
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ extern {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`// -lpthread needs to occur after -ljemalloc, the earlier argument isn't enough`
`28`		`-#[cfg(not(windows))]`
	`28`	`+#[cfg(not(windows), not(target_os = "android"))]`
`29`	`29`	`#[link(name = "pthread")]`
`30`	`30`	`extern {}`
`31`	`31`