- make sure applets.o is rebuilt when the .config changes.
- don't overwrite objects in the archive. Affected applets with name-clash mostly vs. libbb: iplink_main iproute_main iptunnel_main login_main run_parts_main
This commit is contained in:
2
Makefile
2
Makefile
@@ -271,7 +271,7 @@ ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
|
|||||||
# individual object files
|
# individual object files
|
||||||
-include $(top_builddir)/.depend
|
-include $(top_builddir)/.depend
|
||||||
|
|
||||||
|
$(top_builddir)/applets/applets.o: $(top_builddir)/.config
|
||||||
# Everything is set.
|
# Everything is set.
|
||||||
|
|
||||||
all: busybox busybox.links doc ;
|
all: busybox busybox.links doc ;
|
||||||
|
@@ -94,7 +94,7 @@ CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS)))
|
|||||||
WARNINGS=-Wall -Wstrict-prototypes -Wshadow
|
WARNINGS=-Wall -Wstrict-prototypes -Wshadow
|
||||||
CFLAGS+=-I$(top_builddir)/include -I$(top_srcdir)/include
|
CFLAGS+=-I$(top_builddir)/include -I$(top_srcdir)/include
|
||||||
|
|
||||||
ARFLAGS=cru
|
ARFLAGS=cruP
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user