[git commit] Makefile.flags: survive a build system which has no pthread

Denys Vlasenko vda.linux at googlemail.com
Fri Sep 4 02:20:51 UTC 2015

commit: http://git.busybox.net/busybox/commit/?id=2156e228537065f04e5f862e186421df0db36612
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
 Makefile.flags |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/Makefile.flags b/Makefile.flags
index bb90a08..b29b068 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -121,11 +121,16 @@ endif
 # fall back to using a temp file:
 CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c)
 ifeq ($(CRYPT_AVAILABLE),y)
-LDLIBS += m crypt pthread
+LDLIBS += m crypt
 LDLIBS += m
+PTHREAD_AVAILABLE := $(shell echo 'int main(void){return 0;}' >pthreadtest.c; $(CC) $(CFLAGS) -lpthread -o /dev/null pthreadtest.c >/dev/null 2>&1 && echo "y"; rm pthreadtest.c)
+LDLIBS += pthread
 ifeq ($(CONFIG_PAM),y)
 # libpam uses libpthread, libdl and libaudit, so for static builds busybox
 # must be linked to libpthread, libdl and libaudit. On some platforms that

More information about the busybox-cvs mailing list