Backport the SKIP_STRIP flag from svn 18857.
Signed-off-by: Thomas Chou <[EMAIL PROTECTED]>
diff --git a/user/busybox/Makefile b/user/busybox/Makefile
index 0a7eaba..9e690ae 100644
--- a/user/busybox/Makefile
+++ b/user/busybox/Makefile
@@ -690,9 +690,12 @@ busybox_unstripped: $(busybox-all) FORCE
$(Q)rm -f .old_version
busybox: busybox_unstripped
- -$(Q)$(STRIP) -s --remove-section=.note --remove-section=.comment \
+ifeq ($(SKIP_STRIP),y)
+ $(Q)cp $< $@
+else
+ $(Q)$(STRIP) -s --remove-section=.note --remove-section=.comment \
busybox_unstripped -o $@
- @[ -f $@ ] || cp busybox_unstripped busybox
+endif
# The actual objects are generated when descending,
# make sure no implicit rule kicks in
diff --git a/user/busybox/Makefile.flags b/user/busybox/Makefile.flags
index 3728a5b..66a257a 100644
--- a/user/busybox/Makefile.flags
+++ b/user/busybox/Makefile.flags
@@ -3,6 +3,8 @@
# ==========================================================================
BB_VER = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
+export BB_VER
+SKIP_STRIP = n
# -std=gnu99 needed for [U]LLONG_MAX on some systems
CPPFLAGS += $(call cc-option,-std=gnu99,)
@@ -58,7 +60,13 @@ endif
ifeq ($(CONFIG_SELINUX),y)
LDLIBS += -lselinux -lsepol
endif
+
#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
FLTFLAGS += -s 20000
--
1.5.3.3
_______________________________________________
uClinux-dev mailing list
[email protected]
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by [email protected]
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
