From: Mike Frysinger Date: Sat, 31 Mar 2007 03:32:05 +0000 (-0000) Subject: also fix static selinux linking on branch X-Git-Tag: 1_5_1~2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=05732281e46dbb814575f6fcefcfe09a17c2320d;p=oweals%2Fbusybox.git also fix static selinux linking on branch --- diff --git a/Makefile b/Makefile index b42e1792d..c9faf4a9e 100644 --- a/Makefile +++ b/Makefile @@ -302,6 +302,8 @@ AFLAGS_KERNEL = CFLAGS := $(CFLAGS) CPPFLAGS := $(CPPFLAGS) AFLAGS := $(AFLAGS) +LDFLAGS := $(LDFLAGS) +LDLIBS := # Read KERNELRELEASE from .kernelrelease (if it exists) KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null) @@ -565,7 +567,8 @@ quiet_cmd_busybox__ ?= LINK $@ cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \ -o $@ -Wl,-M \ -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \ - -Wl,--start-group $(busybox-all) -Wl,--end-group + -Wl,--start-group $(busybox-all) -Wl,--end-group \ + $(LDLIBS) # Generate System.map quiet_cmd_sysmap = SYSMAP diff --git a/Makefile.flags b/Makefile.flags index b7711f698..3c2cbbbfb 100644 --- a/Makefile.flags +++ b/Makefile.flags @@ -52,10 +52,10 @@ CFLAGS += $(call cc-option,-g) endif ifeq ($(CONFIG_STATIC),y) -LDFLAGS += -static +LDLIBS += -static endif ifeq ($(CONFIG_SELINUX),y) -LDFLAGS += -lselinux -lsepol +LDLIBS += -lselinux -lsepol endif #LDFLAGS += -nostdlib