PERFORCE change 98178 for review

[John Birrell]

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

Change 98178 by jb at jb_freebsd2 on 2006/05/31 00:57:59

	Ensure that building with NO_CDDL really does work (on FreeBSD-6).

Affected files ...

.. //depot/projects/dtrace/src/Makefile.inc1#9 edit

Differences ...

==== //depot/projects/dtrace/src/Makefile.inc1#9 (text+ko) ====

@@ -199,7 +199,7 @@
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \
-		-DNO_WARNS
+		-DNO_WARNS -DNO_CTF
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
@@ -211,6 +211,9 @@
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
+.if defined(NO_CDDL) || defined(NO_CTF)
+WMAKEENV+=	NO_CTF=1
+.endif
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
 .if ${TARGET_ARCH} == "amd64"