ash: [REDIR] Fix popredir on abnormal exit from built-in

[oweals/busybox.git] / Makefile.flags

diff --git a/Makefile.flags b/Makefile.flags
index b6cd32e42327c818bebedc85801a937fcae19891..f3c897b0687f035f2649a292b68f888afcbc7f43 100644 (file)
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -15,7 +15,7 @@ CPPFLAGS += \
        -include include/autoconf.h \
        -D_GNU_SOURCE -DNDEBUG \
        $(if $(CONFIG_LFS),-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) \
-       -D"BB_VER=KBUILD_STR($(BB_VER))" -DBB_BT=AUTOCONF_TIMESTAMP
+       -D"BB_VER=KBUILD_STR($(BB_VER))"
 
 CFLAGS += $(call cc-option,-Wall,)
 CFLAGS += $(call cc-option,-Wshadow,)
@@ -75,6 +75,11 @@ else
 CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,))
 endif
 endif
+ifeq ($(CONFIG_DEBUG_SANITIZE),y)
+CFLAGS += $(call cc-option,-fsanitize=address,)
+CFLAGS += $(call cc-option,-fsanitize=leak,)
+CFLAGS += $(call cc-option,-fsanitize=undefined,)
+endif
 
 # If arch/$(ARCH)/Makefile did not override it (with, say, -fPIC)...
 ARCH_FPIC ?= -fpic
@@ -129,22 +134,19 @@ else
 LDLIBS += m
 endif
 
-ifeq ($(CONFIG_LINK_WITH_PTHREAD),y)
-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)
-ifeq ($(PTHREAD_AVAILABLE),y)
-LDLIBS += pthread
-endif
-endif
+# libpam may use libpthread, libdl and/or libaudit.
+# On some platforms that requires an explicit -lpthread, -ldl, -laudit.
+# However, on *other platforms* it fails when some of those flags
+# given needlessly. On some systems, crypt needs pthread.
+#
+# I even had a system where a runtime test for pthread
+# (similar to CRYPT_AVAILABLE test above) was not reliable.
+#
+# Do not propagate this mess by adding libraries to CONFIG_PAM/CRYPT_AVAILABLE blocks.
+# Add libraries you need to CONFIG_EXTRA_LDLIBS instead.
 
 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
-# requires an explicit -lpthread, -ldl and -laudit, so it should be in
-# LDLIBS. For non-static builds, scripts/trylink will take care of removing
-# these flags if possible. (Not bothering to check CONFIG_STATIC because
-# even in a non-static build it could be that the only libpam available is
-# libpam.a, so -lpthread & Co. could still be needed.)
-LDLIBS += pam pam_misc pthread dl audit
+LDLIBS += pam pam_misc
 endif
 
 ifeq ($(CONFIG_SELINUX),y)