punt %.bflt target in favor of proper LDFLAGS=-Wl,-elf2flt handling

This commit is contained in:
Mike Frysinger 2007-06-19 15:58:02 +00:00
parent 31789a81d5
commit 5b5bcf24f5
3 changed files with 12 additions and 4 deletions

View File

@ -677,8 +677,12 @@ busybox_unstripped: $(busybox-all) FORCE
$(Q)rm -f .old_version $(Q)rm -f .old_version
busybox: busybox_unstripped busybox: busybox_unstripped
ifeq ($(SKIP_STRIP),y)
$(Q)cp $< $@
else
$(Q)$(STRIP) -s --remove-section=.note --remove-section=.comment \ $(Q)$(STRIP) -s --remove-section=.note --remove-section=.comment \
busybox_unstripped -o $@ busybox_unstripped -o $@
endif
# The actual objects are generated when descending, # The actual objects are generated when descending,
# make sure no implicit rule kicks in # make sure no implicit rule kicks in

View File

@ -2,9 +2,6 @@
# Build system # Build system
# ========================================================================== # ==========================================================================
%.bflt: %_unstripped
$(CROSS_COMPILE)elf2flt $(ELF2FLTFLAGS) $< -o $@
busybox.links: $(srctree)/applets/busybox.mkll $(objtree)/include/autoconf.h $(srctree)/include/applets.h busybox.links: $(srctree)/applets/busybox.mkll $(objtree)/include/autoconf.h $(srctree)/include/applets.h
$(Q)-$(SHELL) $^ >$@ $(Q)-$(SHELL) $^ >$@

View File

@ -3,6 +3,7 @@
# ========================================================================== # ==========================================================================
BB_VER = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) BB_VER = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
SKIP_STRIP = n
# -std=gnu99 needed for [U]LLONG_MAX on some systems # -std=gnu99 needed for [U]LLONG_MAX on some systems
CPPFLAGS += $(call cc-option,-std=gnu99,) CPPFLAGS += $(call cc-option,-std=gnu99,)
@ -69,6 +70,12 @@ endif
#LDFLAGS += -nostdlib #LDFLAGS += -nostdlib
LDFLAGS_ELF2FLT = -Wl,-elf2flt
ifneq (,$(findstring $(LDFLAGS_ELF2FLT),$(LDFLAGS)))
SKIP_STRIP = y
endif
# Busybox is a stack-fatty so make sure we increase default size # Busybox is a stack-fatty so make sure we increase default size
# (TODO: use "make stksizes" to find & fix big stack users) # TODO: use "make stksizes" to find & fix big stack users; should
# just steal scripts/checkstack.pl from the kernel ...
FLTFLAGS += -s 20000 FLTFLAGS += -s 20000