aboutsummaryrefslogtreecommitdiff
path: root/Makefile.flags
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-04-23 10:57:02 +0100
committerRon Yorston <rmy@pobox.com>2012-04-23 10:57:02 +0100
commit2903c15333636ae51db14cab009533bac68c8a30 (patch)
tree11a49598f98c505c021202564348c5639e2fb0b1 /Makefile.flags
parent5fc2c035953f71992197f6025918a8fe79ade1d3 (diff)
parentf5234398ef3010b68468cafe3e2ea89b2bb08a17 (diff)
downloadbusybox-w32-2903c15333636ae51db14cab009533bac68c8a30.tar.gz
busybox-w32-2903c15333636ae51db14cab009533bac68c8a30.tar.bz2
busybox-w32-2903c15333636ae51db14cab009533bac68c8a30.zip
Merge commit '1_20_0' into merge
Diffstat (limited to 'Makefile.flags')
-rw-r--r--Makefile.flags5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.flags b/Makefile.flags
index 2a3aa5812..0eb495c60 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -114,7 +114,10 @@ endif
114endif 114endif
115 115
116# Android has no separate crypt library 116# Android has no separate crypt library
117CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' | $(CC) $(CFLAGS) -lcrypt -o /dev/null -xc - >/dev/null 2>&1 && echo "y") 117# gcc-4.2.1 fails if we try to feed C source on stdin:
118# echo 'int main(void){return 0;}' | $(CC) $(CFLAGS) -lcrypt -o /dev/null -xc -
119# fall back to using a temp file:
120CRYPT_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)
118ifeq ($(CRYPT_AVAILABLE),y) 121ifeq ($(CRYPT_AVAILABLE),y)
119LDLIBS += m crypt 122LDLIBS += m crypt
120else 123else