PERFORCE change 172968 for review

[Robert Watson]

http://p4web.freebsd.org/chv.cgi?CH=172968

Change 172968 by rwatson at rwatson_vimage_client on 2010/01/11 15:43:32

	Merge changes in rtld-elf's makefile into our local rtld-elf-cap.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#20 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#20 (text+ko) ====

@@ -1,9 +1,8 @@
 # $FreeBSD$
-# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#19 $
-
-WITHOUT_SSP=
+# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#20 $
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG?=		ld-elf-cap.so.1
 SRCS=		rtld_start.S \
@@ -15,6 +14,7 @@
 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 @@
 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"