diff options
| author | Mike Frysinger | 2007-03-31 03:32:05 +0000 |
|---|---|---|
| committer | Mike Frysinger | 2007-03-31 03:32:05 +0000 |
| commit | 05732281e46dbb814575f6fcefcfe09a17c2320d (patch) | |
| tree | b944a6e6b0d7ef228b6c27558fba18351f93e435 | |
| parent | 4b38e297641c08addea11f82ecf9155ceb58979a (diff) | |
| download | busybox-05732281e46dbb814575f6fcefcfe09a17c2320d.zip busybox-05732281e46dbb814575f6fcefcfe09a17c2320d.tar.gz | |
also fix static selinux linking on branch
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | Makefile.flags | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -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 b7711f6..3c2cbbb 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 |