svn commit: r331031 - stable/10

[Marius Strobl]

Author: marius
Date: Thu Mar 15 22:42:28 2018
New Revision: 331031
URL: https://svnweb.freebsd.org/changeset/base/331031

Log:
  MFC: r287805
  
  Unconditionally build CTF tools in the bootstrap-tools phase of the build.
  
  Stale CTF tools are a frequent source of DTrace issues, and they compile
  quickly enough that the increase in build time is negligible.
  
  Apart from what's described in the original commit message above, this
  change also fixes building GENERIC kernels, i. e. kernel configurations
  having "makeoptions WITH_CTF=1", when the host world has been built with
  WITHOUT_CDDL.

Modified:
  stable/10/Makefile.inc1
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Thu Mar 15 21:42:49 2018	(r331030)
+++ stable/10/Makefile.inc1	Thu Mar 15 22:42:28 2018	(r331031)
@@ -1371,11 +1371,9 @@ ${_bt}-usr.bin/clang/clang-tblgen: ${_bt}-lib/clang/li
 ${_bt}-usr.bin/clang/tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/libllvmsupport
 .endif
 
-# dtrace tools are required for older bootstrap env and cross-build
-.if ${MK_CDDL} != "no" && \
-    ((${BOOTSTRAPPING} < 1000034 && \
-          !(${BOOTSTRAPPING} >= 901505 && ${BOOTSTRAPPING} < 999999)) \
-      || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH}))
+# Rebuild ctfconvert and ctfmerge to avoid difficult-to-diagnose failures
+# resulting from missing bug fixes or ELF Toolchain updates.
+.if ${MK_CDDL} != "no"
 _dtrace_tools= cddl/lib/libctf lib/libelf \
     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge