PERFORCE change 229677 for review

[Brooks Davis]

http://p4web.freebsd.org/@@229677?ac=10

Change 229677 by brooks at brooks_zenith on 2013/06/13 19:20:44

	Manual merge of r251689:
	
	Be more agressive about bootstrapping ctfmerge and ctfconvert so
	builds from existing releases have a chance of working properly.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/Makefile.inc1#14 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#14 (text+ko) ====

@@ -1190,8 +1190,8 @@
 
 # dtrace tools are required for older bootstrap env and cross-build
 .if ${MK_CDDL} != "no" && \
-    ((${BOOTSTRAPPING} < 800038 && \
-          !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)) \
+    ((${BOOTSTRAPPING} < 1000034 && \
+          !(${BOOTSTRAPPING} >= 901505 && ${BOOTSTRAPPING} < 999999)) \
       || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH}))
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge