PERFORCE change 103136 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=103136

Change 103136 by jb at jb_freebsd2 on 2006/08/03 20:42:18

	Allow these apps to link if threads aren't built into libc.
	
	I still think that -lpthread is the wrong way to do this.

Affected files ...

.. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#5 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#5 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#5 (text+ko) ====

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .include	"../../Makefile.inc"
 
 PROG=		ctfconvert
@@ -37,8 +39,6 @@
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDFLAGS+=	-pthread
-
 LDADD+=		-lctf -ldwarf -lelf -lz
 
 .if ${MACHINE_ARCH} != "i386"
@@ -46,10 +46,14 @@
 LDADD+=		-lintl -liconv
 .endif
 
+.if ${MK_LIBC_THREADS} == "no"
+LDADD+= -lpthread
+.endif
+
 .PATH:		${.CURDIR}
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
 
-NO_MAN=
+MK_MAN=no
 
 .include <bsd.prog.mk>

==== //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#5 (text+ko) ====

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .include	"../../Makefile.inc"
 
 PROG=		ctfmerge
@@ -34,8 +36,6 @@
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDFLAGS+=	-pthread
-
 LDADD+=		-lctf -ldwarf -lelf -lz
 
 .if ${MACHINE_ARCH} != "i386"
@@ -43,10 +43,14 @@
 LDADD+=		-lintl -liconv
 .endif
 
+.if ${MK_LIBC_THREADS} == "no"
+LDADD+= -lpthread
+.endif
+
 .PATH:		${.CURDIR}/../ctfconvert
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
 
-NO_MAN=
+MK_MAN=no
 
 .include <bsd.prog.mk>