svn commit: r251689 - head

[Brooks Davis]

Author: brooks
Date: Thu Jun 13 18:26:04 2013
New Revision: 251689
URL: http://svnweb.freebsd.org/changeset/base/251689

Log:
  Be more agressive about bootstrapping ctfmerge and ctfconvert so
  builds from existing releases have a chance of working properly.
  
  Sponsored by:	DARPA, AFRL
  MFC after:	3 days

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Jun 13 17:13:15 2013	(r251688)
+++ head/Makefile.inc1	Thu Jun 13 18:26:04 2013	(r251689)
@@ -1203,8 +1203,8 @@ _clang_tblgen= \
 
 # 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