[prev in list] [next in list] [prev in thread] [next in thread] 

List:       busybox-cvs
Subject:    svn commit: branches/busybox_1_5_stable
From:       vapier () busybox ! net (vapier at busybox ! net)
Date:       2007-03-31 3:32:05
Message-ID: 20070331033205.CAA8F48072 () busybox ! net
[Download RAW message or body]

Author: vapier
Date: 2007-03-30 20:32:05 -0700 (Fri, 30 Mar 2007)
New Revision: 18284

Log:
also fix static selinux linking on branch

Modified:
   branches/busybox_1_5_stable/Makefile
   branches/busybox_1_5_stable/Makefile.flags


Changeset:
Modified: branches/busybox_1_5_stable/Makefile
===================================================================
--- branches/busybox_1_5_stable/Makefile	2007-03-30 18:26:46 UTC (rev 18283)
+++ branches/busybox_1_5_stable/Makefile	2007-03-31 03:32:05 UTC (rev 18284)
@@ -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: branches/busybox_1_5_stable/Makefile.flags
===================================================================
--- branches/busybox_1_5_stable/Makefile.flags	2007-03-30 18:26:46 UTC (rev 18283)
+++ branches/busybox_1_5_stable/Makefile.flags	2007-03-31 03:32:05 UTC (rev 18284)
@@ -52,10 +52,10 @@
 endif
 
 ifeq ($(CONFIG_STATIC),y)
-LDFLAGS += -static
+LDLIBS += -static
 endif
 
 ifeq ($(CONFIG_SELINUX),y)
-LDFLAGS += -lselinux -lsepol
+LDLIBS += -lselinux -lsepol
 endif
 #LDFLAGS += -nostdlib


[prev in list] [next in list] [prev in thread] [next in thread]