Author: ngie
Date: Mon Aug 25 06:10:03 2014
New Revision: 270519
URL: http://svnweb.freebsd.org/changeset/base/270519
Log:
Fix "make checkdpadd" for lib/libc when MK_SSP != no
Add LIBSSP_NONSHARED to bsd.libnames.mk and append LIBSSP_NONSHARED to DPADD
in
lib/libc when MK_SSP != no
Approved by: rpaulo (mentor)
MFC after: 3 days
Phabric: D675 (as part of a larger diff)
PR: 192728
Modified:
head/lib/libc/Makefile
head/share/mk/bsd.libnames.mk
Modified: head/lib/libc/Makefile
==============================================================================
--- head/lib/libc/Makefile Mon Aug 25 05:52:05 2014 (r270518)
+++ head/lib/libc/Makefile Mon Aug 25 06:10:03 2014 (r270519)
@@ -49,6 +49,7 @@ LDFLAGS+= -nodefaultlibs
LDADD+= -lcompiler_rt
.if ${MK_SSP} != "no"
+DPADD+= ${LIBSSP_NONSHARED}
LDADD+= -lssp_nonshared
.endif
Modified: head/share/mk/bsd.libnames.mk
==============================================================================
--- head/share/mk/bsd.libnames.mk Mon Aug 25 05:52:05 2014
(r270518)
+++ head/share/mk/bsd.libnames.mk Mon Aug 25 06:10:03 2014
(r270519)
@@ -132,6 +132,7 @@ LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a
LIBSDP?= ${DESTDIR}${LIBDIR}/libsdp.a
LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a
LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a
+LIBSSP_NONSHARED?= ${DESTDIR}${LIBDIR}/libssp_nonshared.a
LIBSTAND?= ${DESTDIR}${LIBDIR}/libstand.a
LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a
LIBTACPLUS?= ${DESTDIR}${LIBDIR}/libtacplus.a
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
