diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2002-11-26 09:00:02 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2002-11-26 09:00:02 +0000 |
| commit | 43e927ec3253f717e1b75022a2ef0e6b27a2d806 (patch) | |
| tree | f86e20443b5067c8bc69db792aabe9eb014c70c5 /share/mk | |
| parent | 3cea219898adcfcab268e55a6de6004efd808d38 (diff) | |
| download | src-43e927ec3253f717e1b75022a2ef0e6b27a2d806.tar.gz src-43e927ec3253f717e1b75022a2ef0e6b27a2d806.zip | |
NOSHARED is meaningless in the bsd.lib.mk context, so check LDFLAGS
for the -static flag instead when constructing LIBPAM.
(This fixes false warnings from ``make checkdpadd -DNOSHARED'' in
lib/libpam/modules/.)
Submitted by: bde, ru
Approved by: re
Notes
Notes:
svn path=/head/; revision=107256
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.libnames.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 2e84e60a010c..8e6d1263b767 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -66,10 +66,10 @@ LIBOBJC?= ${DESTDIR}${LIBDIR}/libobjc.a LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a # The static PAM library doesn't know its secondary dependencies, -# so we have to specify them explictly. +# so we have to specify them explicitly. LIBPAM?= ${DESTDIR}${LIBDIR}/libpam.a MINUSLPAM?= -lpam -.if defined(NOSHARED) && ${NOSHARED} != "no" && ${NOSHARED} != "NO" +.if defined(LDFLAGS) && !empty(LDFLAGS:M-static) .if defined(MAKE_KERBEROS4) || defined(MAKE_KERBEROS5) .ifdef MAKE_KERBEROS4 LIBPAM+= ${LIBKRB} |