svn commit: trunk/busybox

[vapier at busybox.net]

Author: vapier
Date: 2007-03-29 22:44:15 -0700 (Thu, 29 Mar 2007)
New Revision: 18280

Log:
introduce the concept of LDLIBS for additional libraries so that when we do the final link, the objects/libraries are in the correct order

Modified:
   trunk/busybox/Makefile
   trunk/busybox/Makefile.flags


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2007-03-29 21:55:22 UTC (rev 18279)
+++ trunk/busybox/Makefile	2007-03-30 05:44:15 UTC (rev 18280)
@@ -302,6 +302,8 @@
 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 @@
       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

Modified: trunk/busybox/Makefile.flags
===================================================================
--- trunk/busybox/Makefile.flags	2007-03-29 21:55:22 UTC (rev 18279)
+++ trunk/busybox/Makefile.flags	2007-03-30 05:44:15 UTC (rev 18280)
@@ -56,15 +56,15 @@
 endif
 
 ifeq ($(CONFIG_SELINUX),y)
-LDFLAGS += -lselinux -lsepol
+LDLIBS += -lselinux -lsepol
 endif
 
 ifeq ($(CONFIG_EFENCE),y)
-LDFLAGS += -lefence
+LDLIBS += -lefence
 endif
 
 ifeq ($(CONFIG_DMALLOC),y)
-LDFLAGS += -ldmalloc
+LDLIBS += -ldmalloc
 endif
 
 #LDFLAGS += -nostdlib