PERFORCE change 222407 for review

Brooks Davis brooks at FreeBSD.org
Tue Feb 26 21:11:02 UTC 2013


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

Change 222407 by brooks at 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 \


More information about the p4-projects mailing list