Skip to content

Commit ba801d8

Browse files
committed
auto merge of #11100 : klutzy/rust/win-no-pthread-2, r=alexcrichton
2 parents 20f13b2 + dfe58a9 commit ba801d8

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/librustuv/uvll.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,9 @@ extern {
728728
// libuv requires other native libraries on various platforms. These are all
729729
// listed here (for each platform)
730730

731-
#[cfg(not(target_os = "android"))] // apparently pthreads isn't on android?
731+
// libuv doesn't use pthread on windows
732+
// android libc (bionic) provides pthread, so no additional link is required
733+
#[cfg(not(windows), not(target_os = "android"))]
732734
#[link(name = "pthread")]
733735
extern {}
734736

0 commit comments

Comments
 (0)