X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Makefile.flags;h=2109fdf11c46d56bffacf6b99070da11552a6480;hb=c73b70c7013aa98a86653ad7e7d15bcca16622f2;hp=0ffc05c3555f279a257185e5deb7da510dd48435;hpb=bd8390a872ae42751ff441180017b2d3c76dbe03;p=oweals%2Fbusybox.git

diff --git a/Makefile.flags b/Makefile.flags
index 0ffc05c35..2109fdf11 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -23,6 +23,7 @@ CFLAGS += $(call cc-option,-Wwrite-strings,)
 CFLAGS += $(call cc-option,-Wundef,)
 CFLAGS += $(call cc-option,-Wstrict-prototypes,)
 CFLAGS += $(call cc-option,-Wunused -Wunused-parameter,)
+CFLAGS += $(call cc-option,-Wunused-function -Wunused-value,)
 CFLAGS += $(call cc-option,-Wmissing-prototypes -Wmissing-declarations,)
 # warn about C99 declaration after statement
 CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
@@ -44,12 +45,13 @@ CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1
 
 # FIXME: These warnings are at least partially to be concerned about and should
 # be fixed..
-#CFLAGS+=$(call cc-option,-Wconversion,)
+#CFLAGS += $(call cc-option,-Wconversion,)
 
 ifneq ($(CONFIG_DEBUG),y)
 CFLAGS += $(call cc-option,-Os,)
 else
 CFLAGS += $(call cc-option,-g,)
+#CFLAGS += "-D_FORTIFY_SOURCE=2"
 ifeq ($(CONFIG_DEBUG_PESSIMIZE),y)
 CFLAGS += $(call cc-option,-O0,)
 else
@@ -80,6 +82,11 @@ CFLAGS_busybox += $(ARCH_PIE)
 CFLAGS += $(ARCH_FPIE)
 endif
 
+ifneq ($(CONFIG_EXTRA_CFLAGS),)
+CFLAGS += $(strip $(subst ",,$(CONFIG_EXTRA_CFLAGS)))
+#"))
+endif
+
 LDLIBS += m crypt
 
 ifeq ($(CONFIG_PAM),y)
@@ -98,12 +105,12 @@ ifeq ($(CONFIG_DMALLOC),y)
 LDLIBS += dmalloc
 endif
 
-# If a flat binary should be built, CFLAGS_busybox="-Wl,-elf2flt"
+# If a flat binary should be built, CFLAGS_busybox="-elf2flt"
 # env var should be set for make invocation.
 # Here we check whether CFLAGS_busybox indeed contains that flag.
 # (For historical reasons, we also check LDFLAGS, which doesn't
-# seem to be entirely correct variable to put "-Wl,-elf2flt" into).
-W_ELF2FLT = -Wl,-elf2flt
+# seem to be entirely correct variable to put "-elf2flt" into).
+W_ELF2FLT = -elf2flt
 ifneq (,$(findstring $(W_ELF2FLT),$(LDFLAGS) $(CFLAGS_busybox)))
 SKIP_STRIP = y
 endif