setlogcons, from Jan Kaszka.

[oweals/busybox.git] / Rules.mak

diff --git a/Rules.mak b/Rules.mak
index 34c9be69e5b455df9a5751dc9af76447634ab947..a70ef8cc5e8b47188dc8cd4256fbf3fc9aeb63c8 100644 (file)
--- a/Rules.mak
+++ b/Rules.mak
@@ -15,7 +15,7 @@ PROG      := busybox
 MAJOR_VERSION   :=1
 MINOR_VERSION   :=1
 SUBLEVEL_VERSION:=1
-EXTRAVERSION    :=-pre0
+EXTRAVERSION    :=
 VERSION   :=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL_VERSION)$(EXTRAVERSION)
 BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
 
@@ -131,7 +131,8 @@ ifeq ($(strip $(shell [ $(CC_MAJOR) -ge 3 ] ; echo $$?)),0)
        CFLAGS_COMBINE:=$(call check_gcc,--combine,)
 endif
 OPTIMIZATION+=$(call check_gcc,-funit-at-a-time,)
-PROG_CFLAGS+=$(call check_gcc,-fwhole-program,)
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25795
+#PROG_CFLAGS+=$(call check_gcc,-fwhole-program,)
 endif # CONFIG_BUILD_AT_ONCE
 
 LIB_LDFLAGS:=$(call check_ld,--enable-new-dtags,)
@@ -195,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
@@ -213,7 +210,11 @@ endif
 
 
 ifeq ($(strip $(CONFIG_SELINUX)),y)
-    LIBRARIES += -lselinux
+    SELINUX_INC ?= /usr/include
+    SELINUX_LIB ?= /usr/lib
+    CFLAGS      := -I$(SELINUX_INC) $(CFLAGS)
+    LDFLAGS     := -L$(SELINUX_LIB) $(LDFLAGS)
+    LIBRARIES   += -lselinux
 endif
 
 ifeq ($(strip $(PREFIX)),)