diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2014-08-25 06:10:03 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2014-08-25 06:10:03 +0000 |
| commit | 3303bfc042938b94d38122fdbc0acdba4e9d5fd2 (patch) | |
| tree | eb08fe17a7d3a33896ca15dccb0b920a9d3ae9e8 | |
| parent | 3a1abb4c43c12d7725ab0e6dd5b0fd5db6f99b2e (diff) | |
| download | src-3303bfc042938b94d38122fdbc0acdba4e9d5fd2.tar.gz src-3303bfc042938b94d38122fdbc0acdba4e9d5fd2.zip | |
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
Notes
Notes:
svn path=/head/; revision=270519
| -rw-r--r-- | lib/libc/Makefile | 1 | ||||
| -rw-r--r-- | share/mk/bsd.libnames.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 065642598aec..5a02e51b6ca4 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -49,6 +49,7 @@ LDFLAGS+= -nodefaultlibs LDADD+= -lcompiler_rt .if ${MK_SSP} != "no" +DPADD+= ${LIBSSP_NONSHARED} LDADD+= -lssp_nonshared .endif diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index c7ad449240f0..d76120218e64 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -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 |