svn commit: r203448 - projects/capabilities8/libexec/rtld-elf-cap

[Robert Watson]

Author: rwatson
Date: Wed Feb  3 21:41:42 2010
New Revision: 203448
URL: http://svn.freebsd.org/changeset/base/203448

Log:
  Merge c172968 from the p4 TrustdBSD Capabilities branch to capabilities8:
  
    Merge changes in rtld-elf's makefile into our local rtld-elf-cap.

Modified:
  projects/capabilities8/libexec/rtld-elf-cap/Makefile

Modified: projects/capabilities8/libexec/rtld-elf-cap/Makefile
==============================================================================
--- projects/capabilities8/libexec/rtld-elf-cap/Makefile	Wed Feb  3 21:29:50 2010	(r203447)
+++ projects/capabilities8/libexec/rtld-elf-cap/Makefile	Wed Feb  3 21:41:42 2010	(r203448)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 # $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#21 $
 
-WITHOUT_SSP=
-
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG?=		ld-elf-cap.so.1
 SRCS=		rtld_start.S \
@@ -15,6 +14,7 @@ CSTD?=		gnu99
 CFLAGS+=	-Wall -DFREEBSD_ELF -DIN_RTLD -DIN_RTLD_CAP -g
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../rtld-elf/${MACHINE_ARCH} -I${.CURDIR}/../rtld-elf
 LDFLAGS+=	-nostdlib -Wl,-e,.rtld_start
+WARNS?=		2
 INSTALLFLAGS=	-C -b
 PRECIOUSPROG=
 BINDIR=		/libexec
@@ -23,7 +23,7 @@ MLINKS=		rtld-elf-cap.1 ld-elf-cap.so.1.
 CFLAGS+=	-fpic -DPIC
 LDFLAGS+=	-shared -Wl,-Bsymbolic
 DPADD=		${LIBC_PIC}
-LDADD=		-lc_pic
+LDADD=		-lc_pic -lssp_nonshared
 
 .if ${MACHINE_ARCH} != "ia64"
 .if ${MK_SYMVER} == "yes"