From owner-p4-projects@FreeBSD.ORG  Thu Mar  1 02:16:43 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 51BF4106576C; Thu,  1 Mar 2012 02:16:43 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 122361065675
	for <perforce@FreeBSD.org>; Thu,  1 Mar 2012 02:16:43 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 001CA8FC0A
	for <perforce@FreeBSD.org>; Thu,  1 Mar 2012 02:16:43 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q212GgDw035730
	for <perforce@FreeBSD.org>; Thu, 1 Mar 2012 02:16:42 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q212GgOQ035727
	for perforce@freebsd.org; Thu, 1 Mar 2012 02:16:42 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Thu, 1 Mar 2012 02:16:42 GMT
Message-Id: <201203010216.q212GgOQ035727@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 207139 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Mar 2012 02:16:43 -0000

http://p4web.freebsd.org/@@207139?ac=10

Change 207139 by gonzo@gonzo_thinkpad on 2012/03/01 02:16:40

	- Build dtrace tools for cross-build

Affected files ...

.. //depot/projects/dtrace-mips/Makefile.inc1#4 edit

Differences ...

==== //depot/projects/dtrace-mips/Makefile.inc1#4 (text+ko) ====

@@ -1054,9 +1054,11 @@
 	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