diff options
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/bsd.libnames.mk | 6 | ||||
-rw-r--r-- | share/mk/bsd.prog.mk | 6 |
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} |