diff options
| author | ngie <ngie@FreeBSD.org> | 2014-08-28 19:59:04 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2014-08-28 19:59:04 +0000 |
| commit | fb8a509f8edec260a05a9058b58a80d612c69c05 (patch) | |
| tree | b4d161172c692ac1c13cede72200c07e54b0d12a | |
| parent | 564b330f17f47a63364f8c45c76c24493a627165 (diff) | |
| download | FreeBSD-src-fb8a509f8edec260a05a9058b58a80d612c69c05.zip FreeBSD-src-fb8a509f8edec260a05a9058b58a80d612c69c05.tar.gz | |
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
| -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 04235a2..16da1d0 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -47,6 +47,7 @@ LDFLAGS+= -nodefaultlibs LDADD+= -lgcc .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 2f30c1d..9aa598c 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -142,6 +142,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 |
