From b7502fd352634095fd663465937f566f7e9cb202 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Fri, 23 May 2014 00:20:48 +0000
Subject: 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.

---
 Makefile.inc1 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Makefile.inc1')

diff --git a/Makefile.inc1 b/Makefile.inc1
index 8f1ee1a..09c188b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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
-- 
cgit v1.1