From: Rob Landley <rob@landley.net>
Date: Wed, 22 Mar 2006 21:03:21 +0000 (-0000)
Subject: We make both busybox and busybox_unstripped all the time now, no need to
X-Git-Tag: 1_1_0~41
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ca8d0b029bfe43ae7f168bb6a0cc8a0b42f03be0;p=oweals%2Fbusybox.git

We make both busybox and busybox_unstripped all the time now, no need to
specify whether or not to strip the binary.
---

diff --git a/Config.in b/Config.in
index f67f81aeb..2fbad8f17 100644
--- a/Config.in
+++ b/Config.in
@@ -326,13 +326,6 @@ config CONFIG_EFENCE
 
 endchoice
 
-config CONFIG_STRIP_BINARIES
-	bool "Strip busybox objects"
-	default y if !CONFIG_DEBUG
-	default n if CONFIG_DEBUG
-	help
-	  Whether or not we strip the busybox binary and such.
-
 config CONFIG_DEBUG_YANK_SUSv2
 	bool "Disable obsolete features removed before SUSv3?"
 	default y
diff --git a/Rules.mak b/Rules.mak
index c1406592e..6bf91b2d6 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -196,11 +196,7 @@ else
     LDFLAGS += $(call check_ld,--warn-common,)
     LDFLAGS += $(call check_ld,--sort-common,)
 endif
-ifeq ($(CONFIG_STRIP_BINARIES),y)
-    STRIPCMD:=$(STRIP) -s --remove-section=.note --remove-section=.comment
-else
-    STRIPCMD:=/bin/true -Not_stripping_since_we_are_debugging
-endif
+STRIPCMD:=$(STRIP) -s --remove-section=.note --remove-section=.comment
 ifeq ($(strip $(CONFIG_STATIC)),y)
     PROG_CFLAGS += $(call check_gcc,-static,)
 endif