diff options
| author | bapt <bapt@FreeBSD.org> | 2014-08-06 22:17:26 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-08-06 22:17:26 +0000 |
| commit | 8a9380f42cca5e897a1ccdfa1d7a4d0e624e4864 (patch) | |
| tree | 55e479f80b3d04d5fd6accb8908787cccd17d895 /secure/usr.sbin | |
| parent | 8b0ef17c97fe79b895e87452fef5f810ade727fd (diff) | |
| download | FreeBSD-src-8a9380f42cca5e897a1ccdfa1d7a4d0e624e4864.zip FreeBSD-src-8a9380f42cca5e897a1ccdfa1d7a4d0e624e4864.tar.gz | |
Rework privatelib/internallib
Make sure everything linking to a privatelib and/or an internallib does it directly
from the OBJDIR rather than DESTDIR.
Add src.libnames.mk so bsd.libnames.mk is not polluted by libraries not existsing
in final installation
Introduce the LD* variable which is what ld(1) is expecting (via LDADD) to link to
internal/privatelib
Directly link to the .so in case of private library to avoid having to complexify
LDFLAGS.
Phabric: https://phabric.freebsd.org/D553
Reviewed by: imp, emaste
Diffstat (limited to 'secure/usr.sbin')
| -rw-r--r-- | secure/usr.sbin/sshd/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index d487fe3..7215315 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -26,7 +26,7 @@ MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} ${LIBUTIL} ${LIBWRAP} ${LIBPAM} -LDADD= -lssh -lutil -lwrap ${MINUSLPAM} +LDADD= ${LDSSH} -lutil -lwrap ${MINUSLPAM} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" @@ -47,7 +47,7 @@ CFLAGS+= -include krb5_config.h DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \ ${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC} LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \ - -lcom_err -lroken -lwind -lheimbase -lheimipcc + -lcom_err -lroken -lwind -lheimbase ${LDHEIMIPCC} .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" |
