Makefile related backports:

10945, 10946 Make compile much, much faster.
10923 big makefile change.  Nervous.
10946, 10991, 10998, 11003 small makefile fixes.

26 files changed, 71 insertions, 101 deletions

diff --git a/busybox/Makefile b/busybox/Makefile
index 81c59a089..048194dea 100644
--- a/busybox/Makefile
+++ b/busybox/Makefile
@@ -34,7 +34,7 @@ ifndef top_builddir
 top_builddir=$(CURDIR)
 endif
 
-srctree=$(top_srcdir)
+export srctree=$(top_srcdir)
 vpath %/Config.in $(srctree)
 
 include $(top_builddir)/Rules.mak
@@ -164,9 +164,9 @@ docs/busybox.pod : $(top_srcdir)/docs/busybox_header.pod $(top_srcdir)/include/u
 	    cat $(top_srcdir)/docs/busybox_footer.pod ) > docs/busybox.pod
 
 docs/BusyBox.txt: docs/busybox.pod
-	@echo
-	@echo BusyBox Documentation
-	@echo
+	$(SECHO)
+	$(SECHO) BusyBox Documentation
+	$(SECHO)
 	-mkdir -p docs
 	-pod2text $< > $@
 
@@ -214,9 +214,9 @@ include/config.h: .config
 	@$(top_builddir)/scripts/config/conf -o $(CONFIG_CONFIG_IN)
 
 finished2:
-	@echo
-	@echo Finished installing...
-	@echo
+	$(SECHO)
+	$(SECHO) Finished installing...
+	$(SECHO)
 
 else # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
diff --git a/busybox/Rules.mak b/busybox/Rules.mak
index 1d917c2fa..c46855aca 100644
--- a/busybox/Rules.mak
+++ b/busybox/Rules.mak
@@ -81,12 +81,12 @@ BB_SRC_DIR=
 
 WARNINGS=-Wall -Wstrict-prototypes -Wshadow
 CFLAGS=-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)
-ARFLAGS=-r
+ARFLAGS=cru
 
 #--------------------------------------------------------
 export VERSION BUILDTIME TOPDIR HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP
 ifeq ($(strip $(TARGET_ARCH)),)
-TARGET_ARCH=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \
+TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \
 		-e 's/i.86/i386/' \
 		-e 's/sparc.*/sparc/' \
 		-e 's/arm.*/arm/g' \
@@ -109,14 +109,22 @@ endif
 check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
 	then echo "$(1)"; else echo "$(2)"; fi)
 
+# Setup some shortcuts so that silent mode is silent like it should be
+ifeq ($(subst s,,$(MAKEFLAGS)),$(MAKEFLAGS))
+export MAKE_IS_SILENT=n
+SECHO=@echo
+else
+export MAKE_IS_SILENT=y
+SECHO=-@false
+endif
+
 #--------------------------------------------------------
 # Arch specific compiler optimization stuff should go here.
 # Unless you want to override the defaults, do not set anything
 # for OPTIMIZATION...
 
 # use '-Os' optimization if available, else use -O2
-OPTIMIZATION=
-OPTIMIZATION=${call check_gcc,-Os,-O2}
+OPTIMIZATION:=${call check_gcc,-Os,-O2}
 
 # Some nice architecture specific optimizations
 ifeq ($(strip $(TARGET_ARCH)),arm)
@@ -158,8 +166,8 @@ ifeq ($(strip $(CONFIG_DEBUG)),y)
     STRIPCMD:=/bin/true -Not_stripping_since_we_are_debugging
 else
     CFLAGS+=$(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE -DNDEBUG
-    LDFLAGS += -s -Wl,-warn-common
-    STRIPCMD:=$(STRIP) --remove-section=.note --remove-section=.comment
+    LDFLAGS += -Wl,-warn-common
+    STRIPCMD:=$(STRIP) -s --remove-section=.note --remove-section=.comment
 endif
 ifeq ($(strip $(CONFIG_STATIC)),y)
     LDFLAGS += --static
@@ -190,7 +198,3 @@ endif
 CFLAGS += $(CFLAGS_EXTRA)
 
 .PHONY: dummy
-
-
-.EXPORT_ALL_VARIABLES:
-
diff --git a/busybox/applets/Makefile.in b/busybox/applets/Makefile.in
index e31bb6fd9..8a43c79f3 100644
--- a/busybox/applets/Makefile.in
+++ b/busybox/applets/Makefile.in
@@ -29,7 +29,7 @@ APPLET_OBJ:= $(patsubst %.c,$(APPLETS_DIR)%.o, $(APPLET_SRC))
 libraries-y+=$(APPLETS_DIR)$(APPLETS_AR)
 
 $(APPLETS_DIR)$(APPLETS_AR): $(APPLET_OBJ)
-	$(AR) -ro $@ $(APPLET_OBJ)
+	$(AR) $(ARFLAGS) $@ $(APPLET_OBJ)
 
 $(APPLET_OBJ): $(top_builddir)/.config
 $(APPLET_OBJ): $(APPLETS_DIR)%.o: $(srcdir)/%.c
diff --git a/busybox/archival/Makefile.in b/busybox/archival/Makefile.in
index 76ab6cd08..dd399e1e7 100644
--- a/busybox/archival/Makefile.in
+++ b/busybox/archival/Makefile.in
@@ -41,7 +41,7 @@ ARCHIVAL-$(CONFIG_UNZIP)	+= unzip.o
 libraries-y+=$(ARCHIVAL_DIR)$(ARCHIVAL_AR)
 
 $(ARCHIVAL_DIR)$(ARCHIVAL_AR): $(patsubst %,$(ARCHIVAL_DIR)%, $(ARCHIVAL-y))
-	$(AR) -ro $@ $(patsubst %,$(ARCHIVAL_DIR)%, $(ARCHIVAL-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(ARCHIVAL_DIR)%, $(ARCHIVAL-y))
 
 $(ARCHIVAL_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/archival/libunarchive/Makefile.in b/busybox/archival/libunarchive/Makefile.in
index 809b0e10e..c0464c72b 100644
--- a/busybox/archival/libunarchive/Makefile.in
+++ b/busybox/archival/libunarchive/Makefile.in
@@ -77,7 +77,7 @@ LIBUNARCHIVE-$(CONFIG_UNZIP) += $(GUNZIP_FILES)
 libraries-y+=$(LIBUNARCHIVE_DIR)$(LIBUNARCHIVE_AR)
 
 $(LIBUNARCHIVE_DIR)$(LIBUNARCHIVE_AR): $(patsubst %,$(LIBUNARCHIVE_DIR)%, $(LIBUNARCHIVE-y))
-	$(AR) -ro $@ $(patsubst %,$(LIBUNARCHIVE_DIR)%, $(LIBUNARCHIVE-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(LIBUNARCHIVE_DIR)%, $(LIBUNARCHIVE-y))
 
 $(LIBUNARCHIVA_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/console-tools/Makefile.in b/busybox/console-tools/Makefile.in
index b19ce5cb2..23ce37397 100644
--- a/busybox/console-tools/Makefile.in
+++ b/busybox/console-tools/Makefile.in
@@ -37,7 +37,7 @@ CONSOLETOOLS_DIR-$(CONFIG_SETKEYCODES)	+= setkeycodes.o
 libraries-y+=$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR)
 
 $(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR): $(patsubst %,$(CONSOLETOOLS_DIR)%, $(CONSOLETOOLS_DIR-y))
-	$(AR) -ro $@ $(patsubst %,$(CONSOLETOOLS_DIR)%, $(CONSOLETOOLS_DIR-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(CONSOLETOOLS_DIR)%, $(CONSOLETOOLS_DIR-y))
 
 $(CONSOLETOOLS_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/coreutils/Makefile.in b/busybox/coreutils/Makefile.in
index aacb813b3..628aae0db 100644
--- a/busybox/coreutils/Makefile.in
+++ b/busybox/coreutils/Makefile.in
@@ -91,7 +91,7 @@ COREUTILS-$(CONFIG_YES)     	+= yes.o
 libraries-y+=$(COREUTILS_DIR)$(COREUTILS_AR)
 
 $(COREUTILS_DIR)$(COREUTILS_AR): $(patsubst %,$(COREUTILS_DIR)%, $(COREUTILS-y))
-	$(AR) -ro $@ $(patsubst %,$(COREUTILS_DIR)%, $(COREUTILS-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(COREUTILS_DIR)%, $(COREUTILS-y))
 
 $(COREUTILS_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/coreutils/libcoreutils/Makefile.in b/busybox/coreutils/libcoreutils/Makefile.in
index cf83d7107..5f692b600 100644
--- a/busybox/coreutils/libcoreutils/Makefile.in
+++ b/busybox/coreutils/libcoreutils/Makefile.in
@@ -30,7 +30,7 @@ LIBCOREUTILS_OBJS=$(patsubst %.c,$(LIBCOREUTILS_DIR)%.o, $(LIBCOREUTILS_SRC))
 libraries-y+=$(LIBCOREUTILS_DIR)$(LIBCOREUTILS_AR)
 
 $(LIBCOREUTILS_DIR)$(LIBCOREUTILS_AR): $(LIBCOREUTILS_OBJS)
-	$(AR) -ro $@ $(LIBCOREUTILS_OBJS)
+	$(AR) $(ARFLAGS) $@ $(LIBCOREUTILS_OBJS)
 
 $(LIBCOREUTILS_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/debianutils/Makefile.in b/busybox/debianutils/Makefile.in
index 3a204033e..67f5dd53f 100644
--- a/busybox/debianutils/Makefile.in
+++ b/busybox/debianutils/Makefile.in
@@ -34,7 +34,7 @@ DEBIANUTILS-$(CONFIG_WHICH)		+= which.o
 libraries-y+=$(DEBIANUTILS_DIR)$(DEBIANUTILS_AR)
 
 $(DEBIANUTILS_DIR)$(DEBIANUTILS_AR): $(patsubst %,$(DEBIANUTILS_DIR)%, $(DEBIANUTILS-y))
-	$(AR) -ro $@ $(patsubst %,$(DEBIANUTILS_DIR)%, $(DEBIANUTILS-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(DEBIANUTILS_DIR)%, $(DEBIANUTILS-y))
 
 $(DEBIANUTILS_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/docs/busybox.net/FAQ.html b/busybox/docs/busybox.net/FAQ.html
index a9324ae26..8de06e632 100644
--- a/busybox/docs/busybox.net/FAQ.html
+++ b/busybox/docs/busybox.net/FAQ.html
@@ -254,68 +254,33 @@ have additions to this FAQ document, we would love to add them,
     trust PayPal...
 
 <hr />
+<p>
+<h2><a name="optimize">I want to make busybox even smaller, how do I go about it?</a></h2>
+<p>
+	To conserve bytes it's good to know where they're being used, and the
+	size of the final executable isn't always a reliable indicator of
+	the size of the components (since various structures are rounded up,
+	so a small change may not even be visible by itself, but many small
+	savings add up).
+</p>
+<p>
+	To examine a busybox binary with an eye to saving bytes, build an
+	optimized debug version and run the "nm" command against it, like so:
+</p>
+<p>
+	make clean && make STRIPCMD=/bin/true && nm --size-sort busybox
+</p>
+<p>
+	This gives a list of symbols and the amount of space allocated for
+	each one, sorted by size.  (Note: do not enable CONFIG_DEBUG for this,
+	as that disables compiler optimization which is great for running gdb
+	but misleading when trying to figure out how much space each component
+	is really using under normal circumstances.)
+</p>
+<hr />
+
+
 
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
 <br>
 <br>
 <br>
diff --git a/busybox/editors/Makefile.in b/busybox/editors/Makefile.in
index 571e05568..b43cc463b 100644
--- a/busybox/editors/Makefile.in
+++ b/busybox/editors/Makefile.in
@@ -41,7 +41,7 @@ ifeq ($(needlibm-y),y)
 endif
 
 $(EDITOR_DIR)$(EDITOR_AR): $(patsubst %,$(EDITOR_DIR)%, $(EDITOR-y))
-	$(AR) -ro $@ $(patsubst %,$(EDITOR_DIR)%, $(EDITOR-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(EDITOR_DIR)%, $(EDITOR-y))
 
 $(EDITOR_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/findutils/Makefile.in b/busybox/findutils/Makefile.in
index ae71070d9..107d2519e 100644
--- a/busybox/findutils/Makefile.in
+++ b/busybox/findutils/Makefile.in
@@ -31,7 +31,7 @@ FINDUTILS-$(CONFIG_XARGS)	+= xargs.o
 libraries-y+=$(FINDUTILS_DIR)$(FINDUTILS_AR)
 
 $(FINDUTILS_DIR)$(FINDUTILS_AR): $(patsubst %,$(FINDUTILS_DIR)%, $(FINDUTILS-y))
-	$(AR) -ro $@ $(patsubst %,$(FINDUTILS_DIR)%, $(FINDUTILS-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(FINDUTILS_DIR)%, $(FINDUTILS-y))
 
 $(FINDUTILS_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/init/Makefile.in b/busybox/init/Makefile.in
index 807259dee..9e3eadf51 100644
--- a/busybox/init/Makefile.in
+++ b/busybox/init/Makefile.in
@@ -55,7 +55,7 @@ endif
 libraries-y+=$(INIT_DIR)$(INIT_AR)
 
 $(INIT_DIR)$(INIT_AR): $(patsubst %,$(INIT_DIR)%, $(INIT-y))
-	$(AR) -ro $@ $(patsubst %,$(INIT_DIR)%, $(INIT-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(INIT_DIR)%, $(INIT-y))
 
 $(INIT_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/libbb/Makefile.in b/busybox/libbb/Makefile.in
index d4c5ec14a..212ed70b7 100644
--- a/busybox/libbb/Makefile.in
+++ b/busybox/libbb/Makefile.in
@@ -84,7 +84,7 @@ libraries-y+=$(LIBBB_DIR)$(LIBBB_AR)
 
 $(LIBBB_DIR)$(LIBBB_AR): $(LIBBB_OBJS) $(LIBBB_MOBJS0) $(LIBBB_MOBJS1) \
 	$(LIBBB_MOBJS2) $(LIBBB_MOBJS3) $(LIBBB_MOBJS4)
-	$(AR) -ro $@ $(LIBBB_OBJS) $(LIBBB_MOBJS0) $(LIBBB_MOBJS1) \
+	$(AR) $(ARFLAGS) $@ $(LIBBB_OBJS) $(LIBBB_MOBJS0) $(LIBBB_MOBJS1) \
 		$(LIBBB_MOBJS2) $(LIBBB_MOBJS3) $(LIBBB_MOBJS4)
 
 $(LIBBB_DIR)%.o: $(srcdir)/%.c
diff --git a/busybox/libpwdgrp/Makefile.in b/busybox/libpwdgrp/Makefile.in
index 9bdfc10d8..7d7241c66 100644
--- a/busybox/libpwdgrp/Makefile.in
+++ b/busybox/libpwdgrp/Makefile.in
@@ -42,7 +42,7 @@ LIBPWDGRP_MOBJS1=$(patsubst %,$(LIBPWDGRP_DIR)%, $(LIBPWDGRP_MOBJ1-y))
 libraries-y+=$(LIBPWDGRP_DIR)$(LIBPWDGRP_AR)
 
 $(LIBPWDGRP_DIR)$(LIBPWDGRP_AR): $(LIBPWDGRP_MOBJS0) $(LIBPWDGRP_MOBJS1)
-	$(AR) -ro $@ $(LIBPWDGRP_MOBJS0) $(LIBPWDGRP_MOBJS1)
+	$(AR) $(ARFLAGS) $@ $(LIBPWDGRP_MOBJS0) $(LIBPWDGRP_MOBJS1)
 
 $(LIBPWDGRP_MOBJS0): $(LIBPWDGRP_MSRC0)
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DL_$(notdir $*) -c $< -o $@
diff --git a/busybox/loginutils/Makefile.in b/busybox/loginutils/Makefile.in
index 96a61e60f..cb8733f42 100644
--- a/busybox/loginutils/Makefile.in
+++ b/busybox/loginutils/Makefile.in
@@ -50,7 +50,7 @@ ifeq ($(needcrypt-y),y)
 endif
 
 $(LOGINUTILS_DIR)$(LOGINUTILS_AR): $(patsubst %,$(LOGINUTILS_DIR)%, $(LOGINUTILS-y))
-	$(AR) -ro $@ $(patsubst %,$(LOGINUTILS_DIR)%, $(LOGINUTILS-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(LOGINUTILS_DIR)%, $(LOGINUTILS-y))
 
 $(LOGINUTILS_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/miscutils/Makefile.in b/busybox/miscutils/Makefile.in
index ddddf72b3..6c5ab0d04 100644
--- a/busybox/miscutils/Makefile.in
+++ b/busybox/miscutils/Makefile.in
@@ -48,7 +48,7 @@ ifeq ($(needlibm-y),y)
 endif
 
 $(MISCUTILS_DIR)$(MISCUTILS_AR): $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))
-	$(AR) -ro $@ $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))
 
 $(MISCUTILS_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/modutils/Makefile.in b/busybox/modutils/Makefile.in
index 9bd11d4d8..7bfbae3a4 100644
--- a/busybox/modutils/Makefile.in
+++ b/busybox/modutils/Makefile.in
@@ -32,7 +32,7 @@ MODUTILS-$(CONFIG_RMMOD)		+= rmmod.o
 libraries-y+=$(MODUTILS_DIR)$(MODUTILS_AR)
 
 $(MODUTILS_DIR)$(MODUTILS_AR): $(patsubst %,$(MODUTILS_DIR)%, $(MODUTILS-y))
-	$(AR) -ro $@ $(patsubst %,$(MODUTILS_DIR)%, $(MODUTILS-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(MODUTILS_DIR)%, $(MODUTILS-y))
 
 $(MODUTILS_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/networking/Makefile.in b/busybox/networking/Makefile.in
index 9bfe90176..f0157ad59 100644
--- a/busybox/networking/Makefile.in
+++ b/busybox/networking/Makefile.in
@@ -61,7 +61,7 @@ ifeq ($(needcrypt-y),y)
 endif
 
 $(NETWORKING_DIR)$(NETWORKING_AR): $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y))
-	$(AR) -ro $@ $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y))
 
 $(NETWORKING_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/networking/libiproute/Makefile.in b/busybox/networking/libiproute/Makefile.in
index fcc7f48ce..a28af4611 100644
--- a/busybox/networking/libiproute/Makefile.in
+++ b/busybox/networking/libiproute/Makefile.in
@@ -77,7 +77,7 @@ LIBIPROUTE-$(CONFIG_IPTUNNEL) += \
 libraries-y+=$(LIBIPROUTE_DIR)$(LIBIPROUTE_AR)
 
 $(LIBIPROUTE_DIR)$(LIBIPROUTE_AR): $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y))
-	$(AR) -ro $@ $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y))
 
 $(LIBIPROUTE_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/networking/udhcp/Makefile.in b/busybox/networking/udhcp/Makefile.in
index 94750f693..ac9be5c57 100644
--- a/busybox/networking/udhcp/Makefile.in
+++ b/busybox/networking/udhcp/Makefile.in
@@ -47,7 +47,7 @@ UDHCP_OBJS=$(patsubst %.c,$(UDHCP_DIR)%.o, $(UDHCP-y))
 libraries-y+=$(UDHCP_DIR)$(UDHCP_AR)
 
 $(UDHCP_DIR)$(UDHCP_AR): $(UDHCP_OBJS)
-	$(AR) -ro $@ $(UDHCP_OBJS)
+	$(AR) $(ARFLAGS) $@ $(UDHCP_OBJS)
 
 $(UDHCP_OBJS): $(UDHCP_DIR)%.o : $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DIN_BUSYBOX -c $< -o $@
diff --git a/busybox/networking/udhcp/clientpacket.c b/busybox/networking/udhcp/clientpacket.c
index ec96601cb..a0e8ccfb6 100644
--- a/busybox/networking/udhcp/clientpacket.c
+++ b/busybox/networking/udhcp/clientpacket.c
@@ -76,7 +76,8 @@ static void init_packet(struct dhcpMessage *packet, char type)
 
 	init_header(packet, type);
 	memcpy(packet->chaddr, client_config.arp, 6);
-	add_option_string(packet->options, client_config.clientid);
+	if (client_config.clientid)
+	    add_option_string(packet->options, client_config.clientid);
 	if (client_config.hostname) add_option_string(packet->options, client_config.hostname);
 	add_option_string(packet->options, (uint8_t *) &vendor_id);
 }
diff --git a/busybox/procps/Makefile.in b/busybox/procps/Makefile.in
index ced29a198..b9eb117fd 100644
--- a/busybox/procps/Makefile.in
+++ b/busybox/procps/Makefile.in
@@ -36,7 +36,7 @@ PROCPS-$(CONFIG_UPTIME)		+= uptime.o
 libraries-y+=$(PROCPS_DIR)$(PROCPS_AR)
 
 $(PROCPS_DIR)$(PROCPS_AR): $(patsubst %,$(PROCPS_DIR)%, $(PROCPS-y))
-	$(AR) -ro $@ $(patsubst %,$(PROCPS_DIR)%, $(PROCPS-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(PROCPS_DIR)%, $(PROCPS-y))
 
 $(PROCPS_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/shell/Makefile.in b/busybox/shell/Makefile.in
index 61b2846ac..9677fd62f 100644
--- a/busybox/shell/Makefile.in
+++ b/busybox/shell/Makefile.in
@@ -33,7 +33,7 @@ SHELLT-$(CONFIG_FEATURE_COMMAND_EDITING)	+= cmdedit.o
 libraries-y+=$(SHELL_DIR)$(SHELL_AR)
 
 $(SHELL_DIR)$(SHELL_AR): $(patsubst %,$(SHELL_DIR)%, $(SHELLT-y))
-	$(AR) -ro $@ $(patsubst %,$(SHELL_DIR)%, $(SHELLT-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(SHELL_DIR)%, $(SHELLT-y))
 
 $(SHELL_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/sysklogd/Makefile.in b/busybox/sysklogd/Makefile.in
index 99a5f823c..78efdc7cf 100644
--- a/busybox/sysklogd/Makefile.in
+++ b/busybox/sysklogd/Makefile.in
@@ -32,7 +32,7 @@ SYSKLOGD-$(CONFIG_SYSLOGD)		+= syslogd.o
 libraries-y+=$(SYSKLOGD_DIR)$(SYSKLOGD_AR)
 
 $(SYSKLOGD_DIR)$(SYSKLOGD_AR): $(patsubst %,$(SYSKLOGD_DIR)%, $(SYSKLOGD-y))
-	$(AR) -ro $@ $(patsubst %,$(SYSKLOGD_DIR)%, $(SYSKLOGD-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(SYSKLOGD_DIR)%, $(SYSKLOGD-y))
 
 $(SYSKLOGD_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
diff --git a/busybox/util-linux/Makefile.in b/busybox/util-linux/Makefile.in
index 0172b3562..3e31f8d46 100644
--- a/busybox/util-linux/Makefile.in
+++ b/busybox/util-linux/Makefile.in
@@ -48,7 +48,7 @@ UTILLINUX-$(CONFIG_UMOUNT)		+=umount.o
 libraries-y+=$(UTILLINUX_DIR)$(UTILLINUX_AR)
 
 $(UTILLINUX_DIR)$(UTILLINUX_AR): $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y))
-	$(AR) -ro $@ $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y))
+	$(AR) $(ARFLAGS) $@ $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y))
 
 $(UTILLINUX_DIR)%.o: $(srcdir)/%.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<