svn commit: r270916 - in stable/9: lib/libc share/mk

[Garrett Cooper]

Author: ngie
Date: Mon Sep  1 05:35:55 2014
New Revision: 270916
URL: http://svnweb.freebsd.org/changeset/base/270916

Log:
  MFC r270519:
  
    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)
    Phabric: D675 (as part of a larger diff)
    PR: 192728

Modified:
  stable/9/lib/libc/Makefile
  stable/9/share/mk/bsd.libnames.mk
Directory Properties:
  stable/9/   (props changed)
  stable/9/lib/   (props changed)
  stable/9/lib/libc/   (props changed)
  stable/9/share/   (props changed)
  stable/9/share/mk/   (props changed)

Modified: stable/9/lib/libc/Makefile
==============================================================================
--- stable/9/lib/libc/Makefile	Mon Sep  1 05:26:53 2014	(r270915)
+++ stable/9/lib/libc/Makefile	Mon Sep  1 05:35:55 2014	(r270916)
@@ -39,7 +39,7 @@ CFLAGS+=${CANCELPOINTS_CFLAGS}
 #
 # Only link with static libgcc.a (no libgcc_eh.a).
 #
-DPADD+=	${LIBGCC}
+DPADD+=	${LIBGCC} ${LIBSSP_NONSHARED}
 LDFLAGS+= -nodefaultlibs
 LDADD+= -lgcc -lssp_nonshared
 

Modified: stable/9/share/mk/bsd.libnames.mk
==============================================================================
--- stable/9/share/mk/bsd.libnames.mk	Mon Sep  1 05:26:53 2014	(r270915)
+++ stable/9/share/mk/bsd.libnames.mk	Mon Sep  1 05:35:55 2014	(r270916)
@@ -148,6 +148,7 @@ LIBSDP?=	${DESTDIR}${LIBDIR}/libsdp.a
 LIBSMB?=	${DESTDIR}${LIBDIR}/libsmb.a
 LIBSSH?=	${DESTDIR}${LIBPRIVATEDIR}/libssh.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