diff options
| -rw-r--r-- | lib/libc/Makefile | 1 | ||||
| -rw-r--r-- | share/mk/bsd.libnames.mk | 6 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 6 | ||||
| -rw-r--r-- | usr.sbin/bluetooth/bthidd/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/config/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/pmcstat/Makefile | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 4f107ee..2caf0a1 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -23,6 +23,7 @@ PRECIOUSLIB= # # Only link with static libgcc.a (no libgcc_eh.a). # +DPADD+= ${LIBGCC} LDFLAGS+= -nodefaultlibs LDADD+= -lgcc 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} diff --git a/usr.sbin/bluetooth/bthidd/Makefile b/usr.sbin/bluetooth/bthidd/Makefile index 7ceba10..128bd20 100644 --- a/usr.sbin/bluetooth/bthidd/Makefile +++ b/usr.sbin/bluetooth/bthidd/Makefile @@ -11,7 +11,7 @@ CFLAGS+= -I${.CURDIR} WARNS?= 6 DEBUG_FLAGS= -g -DPADD= ${LIBBLUETOOTH} ${LIBSDP} +DPADD= ${LIBBLUETOOTH} ${LIBUSBHID} LDADD= -lbluetooth -lusbhid .include <bsd.prog.mk> diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile index 8a07269..ac82881 100644 --- a/usr.sbin/config/Makefile +++ b/usr.sbin/config/Makefile @@ -12,7 +12,7 @@ kernconf.c: kernconf.tmpl WARNS?= 6 CFLAGS+= -I. -I${.CURDIR} -DPADD= ${LIBL} +DPADD= ${LIBL} ${LIBSBUF} LDADD= -ll -lsbuf CLEANFILES+= kernconf.c diff --git a/usr.sbin/pmcstat/Makefile b/usr.sbin/pmcstat/Makefile index d212c3f..819a0c0 100644 --- a/usr.sbin/pmcstat/Makefile +++ b/usr.sbin/pmcstat/Makefile @@ -5,7 +5,7 @@ PROG= pmcstat MAN= pmcstat.8 -DPADD= ${LIBPMC} ${LIBM} +DPADD= ${LIBKVM} ${LIBPMC} ${LIBM} LDADD= -lkvm -lpmc -lm WARNS?= 6 |
