diff options
| author | des <des@FreeBSD.org> | 2004-09-22 14:36:12 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-09-22 14:36:12 +0000 |
| commit | dd60f24093444fdbc0af6b156c91edf47be72655 (patch) | |
| tree | 18fb9613eb649cbef81f3d968ae304ce6b5c51f4 | |
| parent | 97ba99e4ade20809da6852c46632a5f29d2ec9b7 (diff) | |
| download | FreeBSD-src-dd60f24093444fdbc0af6b156c91edf47be72655.zip FreeBSD-src-dd60f24093444fdbc0af6b156c91edf47be72655.tar.gz | |
Always link with -lpthread, not -lc_r, because platforms that don't have
full KSE support still have -lpthread as an alias for -lc_r. The only
thing that's different is the name of the knob that turns it off.
Pointed out by: ru@
| -rw-r--r-- | lib/bind/config.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/bind/config.mk b/lib/bind/config.mk index e950d7d..7190e42 100644 --- a/lib/bind/config.mk +++ b/lib/bind/config.mk @@ -59,8 +59,8 @@ BIND_LDADD= -lbind9 -ldns -lisccc -lisccfg -lisc -llwres # Link against crypto library .if !defined(NOCRYPT) -CRYPTO_DPADD+= ${LIBCRYPTO} -CRYPTO_LDADD+= -lcrypto +CRYPTO_DPADD= ${LIBCRYPTO} +CRYPTO_LDADD= -lcrypto .endif # Link against POSIX threads library @@ -68,12 +68,11 @@ CRYPTO_LDADD+= -lcrypto .if defined(NOLIBC_R) .error "BIND requires libc_r - define NO_BIND, or undefine NOLIBC_R" .endif -PTHREAD_DPADD+= ${LIBC_R} -PTHREAD_LDADD+= -lc_r .else .if defined(NOLIBPTHREAD) .error "BIND requires libpthread - define NO_BIND, or undefine NOLIBPTHREAD" .endif -PTHREAD_DPADD+= ${LIBPTHREAD} -PTHREAD_LDADD+= -lpthread .endif + +PTHREAD_DPADD= ${LIBPTHREAD} +PTHREAD_LDADD= -lpthread |
