From owner-p4-projects@FreeBSD.ORG  Tue Feb 26 21:11:02 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 13B3E754; Tue, 26 Feb 2013 21:11:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C5EE4752
 for <perforce@freebsd.org>; Tue, 26 Feb 2013 21:11:01 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B8061EB
 for <perforce@freebsd.org>; Tue, 26 Feb 2013 21:11:01 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1QLB1PD012416
 for <perforce@freebsd.org>; Tue, 26 Feb 2013 21:11:01 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1QLB19v012413
 for perforce@freebsd.org; Tue, 26 Feb 2013 21:11:01 GMT
 (envelope-from brooks@freebsd.org)
Date: Tue, 26 Feb 2013 21:11:01 GMT
Message-Id: <201302262111.r1QLB19v012413@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 222407 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Tue, 26 Feb 2013 21:11:02 -0000

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

Change 222407 by brooks@brooks_zenith on 2013/02/26 21:10:49

	If XCC is an absolute path or WITHOUT_CROSS_COMPILER is set, do
	not build a cross compiler during the cross-tools phase.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/Makefile.inc1#6 edit
.. //depot/projects/ctsrd/tesla/src/share/man/man5/src.conf.5#3 edit
.. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#5 edit
.. //depot/projects/ctsrd/tesla/src/tools/build/options/WITHOUT_CROSS_COMPILER#1 add

Differences ...

==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#6 (text+ko) ====

@@ -1307,6 +1307,9 @@
 _binutils=	gnu/usr.bin/binutils
 .endif
 
+# If an full path to an external cross compiler is given, don't build
+# a cross compiler.
+.if ${XCC:M/*} == "" && ${MK_CROSS_COMPILER} != "no"
 .if ${MK_CLANG} != "no" && (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang")
 _clang=		usr.bin/clang
 _clang_libs=	lib/clang
@@ -1315,6 +1318,7 @@
 .if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
 _cc=		gnu/usr.bin/cc
 .endif
+.endif
 
 cross-tools:
 .for _tool in \

==== //depot/projects/ctsrd/tesla/src/share/man/man5/src.conf.5#3 (text) ====

@@ -343,6 +343,10 @@
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru
 Set to not build
 .Xr cpp 1 .
+.It Va WITHOUT_CROSS_COMPILER
+.\" $FreeBSD$
+Set to not build a cross compiler in the cross-tools stage of
+buildworld, buildkernel, etc.
 .It Va WITHOUT_CRYPT
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CRYPT 156932 2006-03-21 07:50:50Z ru
 Set to not build any crypto code.

==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#5 (text+ko) ====

@@ -262,6 +262,7 @@
     CAPSICUM \
     CDDL \
     CPP \
+    CROSS_COMPILER \
     CRYPT \
     CTM \
     CVS \