diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-17 20:39:27 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-17 20:39:27 +0000 |
| commit | 150d2fa114d626761a67e529959433226793e733 (patch) | |
| tree | aa2f46682b3bf49fb7f4d746f8f68d43f7223980 /Makefile.flags | |
| parent | c5f24268381e462a688ae29193deb6857a9db485 (diff) | |
| download | busybox-w32-150d2fa114d626761a67e529959433226793e733.tar.gz busybox-w32-150d2fa114d626761a67e529959433226793e733.tar.bz2 busybox-w32-150d2fa114d626761a67e529959433226793e733.zip | |
Modify method of linking against libs. Now we fisrt try all
specified libs, and if it succeeds, we try to remove them
one-by-one. If link succeeds, then library is thrown out.
Should solve the problem with SELinux linking in libsepol
even when not needed.
Diffstat (limited to 'Makefile.flags')
| -rw-r--r-- | Makefile.flags | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.flags b/Makefile.flags index b54679047..d8817bed6 100644 --- a/Makefile.flags +++ b/Makefile.flags | |||
| @@ -59,18 +59,25 @@ ifeq ($(CONFIG_STATIC),y) | |||
| 59 | LDFLAGS += -static | 59 | LDFLAGS += -static |
| 60 | endif | 60 | endif |
| 61 | 61 | ||
| 62 | BBOX_LIB_LIST = m crypt | ||
| 62 | ifeq ($(CONFIG_SELINUX),y) | 63 | ifeq ($(CONFIG_SELINUX),y) |
| 63 | LDLIBS += -lselinux -lsepol | 64 | #LDLIBS += -lselinux -lsepol |
| 65 | BBOX_LIB_LIST += selinux sepol | ||
| 64 | endif | 66 | endif |
| 65 | 67 | ||
| 66 | ifeq ($(CONFIG_EFENCE),y) | 68 | ifeq ($(CONFIG_EFENCE),y) |
| 67 | LDLIBS += -lefence | 69 | #LDLIBS += -lefence |
| 70 | BBOX_LIB_LIST += efence | ||
| 68 | endif | 71 | endif |
| 69 | 72 | ||
| 70 | ifeq ($(CONFIG_DMALLOC),y) | 73 | ifeq ($(CONFIG_DMALLOC),y) |
| 71 | LDLIBS += -ldmalloc | 74 | #LDLIBS += -ldmalloc |
| 75 | BBOX_LIB_LIST += dmalloc | ||
| 72 | endif | 76 | endif |
| 73 | 77 | ||
| 78 | # For scripts/trylink | ||
| 79 | export BBOX_LIB_LIST | ||
| 80 | |||
| 74 | #LDFLAGS += -nostdlib | 81 | #LDFLAGS += -nostdlib |
| 75 | 82 | ||
| 76 | LDFLAGS_ELF2FLT = -Wl,-elf2flt | 83 | LDFLAGS_ELF2FLT = -Wl,-elf2flt |