Applied, thank you.
On Mon, Nov 8, 2021 at 5:56 PM Martin Kaiser <[email protected]> wrote: > > From: Martin Kaiser <[email protected]> > > To check if libcrypt and librt are available, we check if we can > compile and link a simple test program. > > These checks do not match the actual linking if CONFIG_STATIC is enabled. > For CONFIG_STATIC, CFLAGS_busybox is set to -static. The checks don't use > CFLAGS_busybox and detect a shared libcrypt or librt. If we link busybox > later and we have no static libcrypt or librt, linking will fail. > > Update the libcrypt and librt checks to use CFLAGS_busybox. > > Signed-off-by: Martin Kaiser <[email protected]> > --- > Makefile.flags | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile.flags b/Makefile.flags > index 667481983..c34356230 100644 > --- a/Makefile.flags > +++ b/Makefile.flags > @@ -151,8 +151,8 @@ LDLIBS += m > # gcc-4.2.1 fails if we try to feed C source on stdin: > # echo 'int main(void){return 0;}' | $(CC) $(CFLAGS) -lcrypt -o /dev/null > -xc - > # fall back to using a temp file: > -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) > -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) > +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) > +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) > ifeq ($(CRYPT_AVAILABLE),y) > LDLIBS += crypt > endif > -- > 2.20.1 > > _______________________________________________ > busybox mailing list > [email protected] > http://lists.busybox.net/mailman/listinfo/busybox _______________________________________________ busybox mailing list [email protected] http://lists.busybox.net/mailman/listinfo/busybox
