--- busybox-1.8.2/Makefile.flags	2007-11-10 02:40:54.000000000 +0100
+++ busybox-1.8.2-magellan/Makefile.flags	2008-01-15 23:06:20.000000000 +0100
@@ -28,7 +28,7 @@
 # in warnings pretty soon.
 
 ifeq ($(CONFIG_WERROR),y)
-CFLAGS += $(call cc-option,-Werror,)
+CFLAGS += $(call cc-option,,)
 else
 # for development, warn a little bit about unused results..
 CPPFLAGS += -D_FORTIFY_SOURCE=2
@@ -41,12 +41,12 @@
 CFLAGS += $(call cc-option,-Wmissing-prototypes -Wmissing-declarations,)
 endif
 
-CFLAGS += $(call cc-option,-Os -fno-builtin-strlen -finline-limit=0 -fomit-frame-pointer -ffunction-sections -fdata-sections,)
+CFLAGS += $(call cc-option, -fno-builtin-strlen -finline-limit=0 -ffunction-sections -fdata-sections,)
 # -fno-guess-branch-probability: prohibit pseudo-random guessing
 # of branch probabilities (hopefully makes bloatcheck more stable):
 CFLAGS += $(call cc-option,-fno-guess-branch-probability,)
 CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,)
-CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,)
+CFLAGS += $(call cc-option,,)
 
 # FIXME: These warnings are at least partially to be concerned about and should
 # be fixed..