From 849b089a63cb40833006704fb6e3fc66e8010dfa Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sun, 1 Sep 2013 13:37:26 -0700 Subject: [PATCH 1/1] Don't use lpthread for Android Thanks to Peter Osterlund for the feedback. No functional change. --- src/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index 67cd382a..860b146a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -263,9 +263,12 @@ endif ### On mingw use Windows threads, otherwise POSIX ifneq ($(comp),mingw) - # Haiku has pthreads in its libroot, so only link it in on other platforms - ifneq ($(UNAME),Haiku) - LDFLAGS += -lpthread + # On Android Bionic's C library comes with its own pthread implementation bundled in + ifneq ($(arch),armv7) + # Haiku has pthreads in its libroot, so only link it in on other platforms + ifneq ($(UNAME),Haiku) + LDFLAGS += -lpthread + endif endif endif -- 2.39.2