aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-03-30 05:44:15 +0000
committerMike Frysinger <vapier@gentoo.org>2007-03-30 05:44:15 +0000
commit52a9db6bb874c9ce7a8b7e935ba3ebbefdf3f7d4 (patch)
tree0a00f3190ef9bc4df6e93a4a973080d53b5a66dc
parent2e723237c932f117a74ddaab66277d1a9bb29cc5 (diff)
downloadbusybox-w32-52a9db6bb874c9ce7a8b7e935ba3ebbefdf3f7d4.tar.gz
busybox-w32-52a9db6bb874c9ce7a8b7e935ba3ebbefdf3f7d4.tar.bz2
busybox-w32-52a9db6bb874c9ce7a8b7e935ba3ebbefdf3f7d4.zip
introduce the concept of LDLIBS for additional libraries so that when we do the final link, the objects/libraries are in the correct order
-rw-r--r--Makefile5
-rw-r--r--Makefile.flags6
2 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 6a50a2859..4f45ae822 100644
--- a/Makefile
+++ b/Makefile
@@ -302,6 +302,8 @@ AFLAGS_KERNEL =
302CFLAGS := $(CFLAGS) 302CFLAGS := $(CFLAGS)
303CPPFLAGS := $(CPPFLAGS) 303CPPFLAGS := $(CPPFLAGS)
304AFLAGS := $(AFLAGS) 304AFLAGS := $(AFLAGS)
305LDFLAGS := $(LDFLAGS)
306LDLIBS :=
305 307
306# Read KERNELRELEASE from .kernelrelease (if it exists) 308# Read KERNELRELEASE from .kernelrelease (if it exists)
307KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null) 309KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null)
@@ -565,7 +567,8 @@ quiet_cmd_busybox__ ?= LINK $@
565 cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \ 567 cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \
566 -o $@ -Wl,-M \ 568 -o $@ -Wl,-M \
567 -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \ 569 -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \
568 -Wl,--start-group $(busybox-all) -Wl,--end-group 570 -Wl,--start-group $(busybox-all) -Wl,--end-group \
571 $(LDLIBS)
569 572
570# Generate System.map 573# Generate System.map
571quiet_cmd_sysmap = SYSMAP 574quiet_cmd_sysmap = SYSMAP
diff --git a/Makefile.flags b/Makefile.flags
index 487300de2..e4cdc459e 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -56,15 +56,15 @@ LDFLAGS += -static
56endif 56endif
57 57
58ifeq ($(CONFIG_SELINUX),y) 58ifeq ($(CONFIG_SELINUX),y)
59LDFLAGS += -lselinux -lsepol 59LDLIBS += -lselinux -lsepol
60endif 60endif
61 61
62ifeq ($(CONFIG_EFENCE),y) 62ifeq ($(CONFIG_EFENCE),y)
63LDFLAGS += -lefence 63LDLIBS += -lefence
64endif 64endif
65 65
66ifeq ($(CONFIG_DMALLOC),y) 66ifeq ($(CONFIG_DMALLOC),y)
67LDFLAGS += -ldmalloc 67LDLIBS += -ldmalloc
68endif 68endif
69 69
70#LDFLAGS += -nostdlib 70#LDFLAGS += -nostdlib