diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-12-27 08:21:55 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-12-27 08:21:55 +0000 |
| commit | b15f68214da209b5b293039c09c00f490c0cc193 (patch) | |
| tree | d644b5d9318b79cb1baa356cbb63318cc4872c05 /Makefile.flags | |
| parent | 1ee308c75f4720ee38be8e81ff8c9ed4c52670d4 (diff) | |
| parent | 44075929a8b9c1861d15564fa6ac4562abb724d7 (diff) | |
| download | busybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.tar.gz busybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.tar.bz2 busybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.zip | |
Merge busybox into merge
Fix merge conflict in coreutils/timeout.c.
Diffstat (limited to 'Makefile.flags')
| -rw-r--r-- | Makefile.flags | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.flags b/Makefile.flags index 2687781f1..f202a5f54 100644 --- a/Makefile.flags +++ b/Makefile.flags | |||
| @@ -159,8 +159,8 @@ LDLIBS += m | |||
| 159 | # gcc-4.2.1 fails if we try to feed C source on stdin: | 159 | # gcc-4.2.1 fails if we try to feed C source on stdin: |
| 160 | # echo 'int main(void){return 0;}' | $(CC) $(CFLAGS) -lcrypt -o /dev/null -xc - | 160 | # echo 'int main(void){return 0;}' | $(CC) $(CFLAGS) -lcrypt -o /dev/null -xc - |
| 161 | # fall back to using a temp file: | 161 | # fall back to using a temp file: |
| 162 | CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >bb_libtest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c) | 162 | CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >bb_libtest.c; $(CC) $(CFLAGS) $(CFLAGS_busybox) -lcrypt -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c) |
| 163 | RT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >bb_libtest.c; $(CC) $(CFLAGS) -lrt -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c) | 163 | RT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >bb_libtest.c; $(CC) $(CFLAGS) $(CFLAGS_busybox) -lrt -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c) |
| 164 | ifeq ($(CRYPT_AVAILABLE),y) | 164 | ifeq ($(CRYPT_AVAILABLE),y) |
| 165 | LDLIBS += crypt | 165 | LDLIBS += crypt |
| 166 | endif | 166 | endif |