Skip to content

Commit 849b089

Browse files
committed
Don't use lpthread for Android
Thanks to Peter Osterlund for the feedback. No functional change.
1 parent aee404f commit 849b089

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,12 @@ endif
263263

264264
### On mingw use Windows threads, otherwise POSIX
265265
ifneq ($(comp),mingw)
266-
# Haiku has pthreads in its libroot, so only link it in on other platforms
267-
ifneq ($(UNAME),Haiku)
268-
LDFLAGS += -lpthread
266+
# On Android Bionic's C library comes with its own pthread implementation bundled in
267+
ifneq ($(arch),armv7)
268+
# Haiku has pthreads in its libroot, so only link it in on other platforms
269+
ifneq ($(UNAME),Haiku)
270+
LDFLAGS += -lpthread
271+
endif
269272
endif
270273
endif
271274

0 commit comments

Comments
 (0)