aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-03-22 21:03:21 +0000
committerRob Landley <rob@landley.net>2006-03-22 21:03:21 +0000
commitca8d0b029bfe43ae7f168bb6a0cc8a0b42f03be0 (patch)
treedb38aeab9aba29603451c672ca66c5b3c820aa8e
parent2dd42799594c6197ca97ca3ec65ec73c81af0875 (diff)
downloadbusybox-w32-ca8d0b029bfe43ae7f168bb6a0cc8a0b42f03be0.tar.gz
busybox-w32-ca8d0b029bfe43ae7f168bb6a0cc8a0b42f03be0.tar.bz2
busybox-w32-ca8d0b029bfe43ae7f168bb6a0cc8a0b42f03be0.zip
We make both busybox and busybox_unstripped all the time now, no need to
specify whether or not to strip the binary.
-rw-r--r--Config.in7
-rw-r--r--Rules.mak6
2 files changed, 1 insertions, 12 deletions
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
326 326
327endchoice 327endchoice
328 328
329config CONFIG_STRIP_BINARIES
330 bool "Strip busybox objects"
331 default y if !CONFIG_DEBUG
332 default n if CONFIG_DEBUG
333 help
334 Whether or not we strip the busybox binary and such.
335
336config CONFIG_DEBUG_YANK_SUSv2 329config CONFIG_DEBUG_YANK_SUSv2
337 bool "Disable obsolete features removed before SUSv3?" 330 bool "Disable obsolete features removed before SUSv3?"
338 default y 331 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
196 LDFLAGS += $(call check_ld,--warn-common,) 196 LDFLAGS += $(call check_ld,--warn-common,)
197 LDFLAGS += $(call check_ld,--sort-common,) 197 LDFLAGS += $(call check_ld,--sort-common,)
198endif 198endif
199ifeq ($(CONFIG_STRIP_BINARIES),y) 199STRIPCMD:=$(STRIP) -s --remove-section=.note --remove-section=.comment
200 STRIPCMD:=$(STRIP) -s --remove-section=.note --remove-section=.comment
201else
202 STRIPCMD:=/bin/true -Not_stripping_since_we_are_debugging
203endif
204ifeq ($(strip $(CONFIG_STATIC)),y) 200ifeq ($(strip $(CONFIG_STATIC)),y)
205 PROG_CFLAGS += $(call check_gcc,-static,) 201 PROG_CFLAGS += $(call check_gcc,-static,)
206endif 202endif