svn commit: r233416 - head

[Oleksandr Tymoshenko]

Author: gonzo
Date: Sat Mar 24 05:30:13 2012
New Revision: 233416
URL: http://svn.freebsd.org/changeset/base/233416

Log:
  Build CTF tools as a part of toolchain for cross-compilation case

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat Mar 24 05:29:07 2012	(r233415)
+++ head/Makefile.inc1	Sat Mar 24 05:30:13 2012	(r233416)
@@ -1047,9 +1047,11 @@ _clang_tblgen= \
 	usr.bin/clang/clang-tblgen
 .endif
 
+# dtrace tools are required for older bootstrap env and cross-build
 .if ${MK_CDDL} != "no" && \
-    ${BOOTSTRAPPING} < 800038 && \
-    !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)
+    ((${BOOTSTRAPPING} < 800038 && \
+          !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)) \
+      || (${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
 .endif