summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2007-10-01 18:15:11 +0000
committerru <ru@FreeBSD.org>2007-10-01 18:15:11 +0000
commit0de18b1b0a14db0095b700d2d40a742b327ea811 (patch)
tree3304513635084cc8218bccdfe0c0000f04f281f9 /share
parent9439813d075fa749d870705314851a423813bbdc (diff)
downloadFreeBSD-src-0de18b1b0a14db0095b700d2d40a742b327ea811.zip
FreeBSD-src-0de18b1b0a14db0095b700d2d40a742b327ea811.tar.gz
Fixed "make checkdpadd" (missing library dependencies).
Approved by: re (kensmith)
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.libnames.mk6
-rw-r--r--share/mk/bsd.prog.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index a00d5f8..2eaf9c3 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -120,11 +120,7 @@ MINUSLPAM+= -lypclnt
LIBPANEL?= ${DESTDIR}${LIBDIR}/libpanel.a
LIBPCAP?= ${DESTDIR}${LIBDIR}/libpcap.a
LIBPMC?= ${DESTDIR}${LIBDIR}/libpmc.a
-.if defined(DEFAULT_THREAD_LIB)
-LIBPTHREAD?= ${DESTDIR}${LIBDIR}/${DEFAULT_THREAD_LIB}.a
-.else
-LIBPTHREAD?= ${DESTDIR}${LIBDIR}/libthr.a
-.endif
+LIBPTHREAD?= ${DESTDIR}${LIBDIR}/libpthread.a
LIBRADIUS?= ${DESTDIR}${LIBDIR}/libradius.a
LIBREADLINE?= ${DESTDIR}${LIBDIR}/libreadline.a
LIBROKEN?= ${DESTDIR}${LIBDIR}/libroken.a
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 9601c71..b9fee32 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -40,8 +40,12 @@ PROG= ${PROG_CXX}
# If there are Objective C sources, link with Objective C libraries.
.if !empty(SRCS:M*.m)
-OBJCLIBS?= -lobjc -lpthread
+.if defined(OBJCLIBS)
LDADD+= ${OBJCLIBS}
+.else
+DPADD+= ${LIBOBJC} ${LIBPTHREAD}
+LDADD+= -lobjc -lpthread
+.endif
.endif
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
OpenPOWER on IntegriCloud