svn commit: r266567 - head

[Warner Losh]

Author: imp
Date: Fri May 23 00:20:48 2014
New Revision: 266567
URL: http://svnweb.freebsd.org/changeset/base/266567

Log:
  When libelf and libdwarf were updated, we didn't bump the minimal
  version needed for CTF tools, so sometimes we'd use the host's CTF
  tools that didn't work. Be sure to bootstrap in that case.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri May 23 00:20:44 2014	(r266566)
+++ head/Makefile.inc1	Fri May 23 00:20:48 2014	(r266567)
@@ -1238,9 +1238,8 @@ _clang_tblgen= \
 .endif
 
 # dtrace tools are required for older bootstrap env and cross-build
-.if ${MK_CDDL} != "no" && \
-    ((${BOOTSTRAPPING} < 1000034 && \
-          !(${BOOTSTRAPPING} >= 901505 && ${BOOTSTRAPPING} < 999999)) \
+# pre libdwarf
+.if ${MK_CDDL} != "no" && (${BOOTSTRAPPING} < 1100006 \
       || (${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