svn commit: r300349 - head

[Bryan Drewery]

Author: bdrewery
Date: Sat May 21 01:32:07 2016
New Revision: 300349
URL: https://svnweb.freebsd.org/changeset/base/300349

Log:
  Enable and utilize WITHOUT_CROSS_COMPILER logic for external CC.
  
  This is a NOP.
  
  Reviewed by:	brooks, bapt
  Sponsored by:	EMC / Isilon Storage Division
  Differential Revision:	https://reviews.freebsd.org/D6354

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat May 21 01:32:04 2016	(r300348)
+++ head/Makefile.inc1	Sat May 21 01:32:07 2016	(r300349)
@@ -91,6 +91,12 @@ X${BINUTIL}?=	${CROSS_BINUTILS_PREFIX}${
 X${BINUTIL}?=	${${BINUTIL}}
 .endif
 .endfor
+# If a full path to an external cross compiler is given, don't build
+# a cross compiler.
+.if ${XCC:N${CCACHE_BIN}:M/*}
+MK_CROSS_COMPILER=	no
+.endif
+
 .include <bsd.compiler.mk>		# don't depend on src.opts.mk doing it
 .include "share/mk/src.opts.mk"	
 
@@ -454,7 +460,7 @@ BFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 .endif
 
 # External compiler needs sysroot and target flags.
-.if ${XCC:N${CCACHE_BIN}:M/*} || ${MK_CROSS_COMPILER} == "no"
+.if ${MK_CROSS_COMPILER} == "no"
 .if !defined(CROSS_BINUTILS_PREFIX) || !exists(${CROSS_BINUTILS_PREFIX})
 BFLAGS+=	-B${WORLDTMP}/usr/bin
 .endif
@@ -478,7 +484,7 @@ XCFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 XCFLAGS+=	--sysroot=${WORLDTMP}
 .else
-.endif # ${XCC:M/*} || ${MK_CROSS_COMPILER} == "no"
+.endif # ${MK_CROSS_COMPILER} == "no"
 
 .if !empty(BFLAGS)
 XCFLAGS+=	${BFLAGS}
@@ -1714,9 +1720,7 @@ _elftctools=	lib/libelftc \
 		usr.bin/elfcopy
 .endif
 
-# If an full path to an external cross compiler is given, don't build
-# a cross compiler.
-.if ${XCC:N${CCACHE_BIN}:M/*} == "" && ${MK_CROSS_COMPILER} != "no"
+.if ${MK_CROSS_COMPILER} != "no"
 .if ${MK_CLANG_BOOTSTRAP} != "no"
 _clang=		usr.bin/clang
 _clang_libs=	lib/clang