fix subtle bug inherited from dash

[oweals/busybox.git] / Makefile.flags

diff --git a/Makefile.flags b/Makefile.flags
index 39c544e607a915e5b1c5b0d9e58e8315645877b1..384b0f8d6b958847b26535e4227bfa0319e6f036 100644 (file)
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -1,19 +1,31 @@
 # ==========================================================================
-# Building
+# Build system
 # ==========================================================================
 
 BB_VER = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
-CPPFLAGS       += \
-               -Iinclude -Ilibbb \
-               $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) -I$(srctree)/libbb \
-               -include include/autoconf.h \
-               -D_GNU_SOURCE -DNDEBUG \
-               -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
-               -D"BB_VER=KBUILD_STR($(BB_VER))" -DBB_BT=AUTOCONF_TIMESTAMP \
-               -Wall -Wstrict-prototypes -Wshadow -Werror \
-               -funsigned-char -fno-builtin-strlen -finline-limit=0 -static-libgcc \
-               -Os -march=i386 -mpreferred-stack-boundary=2 \
-               -falign-functions=1 -falign-jumps=1 -falign-loops=1 \
-               -fomit-frame-pointer -ffunction-sections -fdata-sections \
-               -funsigned-char -fno-builtin-strlen \
+# -std=gnu99 needed for [U]LLONG_MAX on some systems
+
+CPPFLAGS += \
+       -std=gnu99 \
+       -Iinclude -Ilibbb \
+       $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) -I$(srctree)/libbb \
+       -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
+
+CFLAGS += \
+       -Wall -Wstrict-prototypes -Wshadow -Werror -Wundef \
+       -funsigned-char -fno-builtin-strlen -finline-limit=0 -static-libgcc \
+       -Os -falign-functions=1 -falign-jumps=1 -falign-loops=1 \
+       -fomit-frame-pointer -ffunction-sections -fdata-sections
+
+ifeq ($(CONFIG_DEBUG),y)
+CFLAGS += -g
+endif
+
+ifeq ($(CONFIG_STATIC),y)
+LDFLAGS += -static
+endif
+#LDFLAGS += -nostdlib