svn commit: r278965 - head

[Peter Grehan]

Author: grehan
Date: Wed Feb 18 19:27:51 2015
New Revision: 278965
URL: https://svnweb.freebsd.org/changeset/base/278965

Log:
  Restore the ability to use clang as an external compiler. This was
  inadvertently removed when support for external GCC was added.
  
  Deprecate XFLAGS in favour of the newer XCFLAGS/XCXXFLAGS.
  
  Tested with:	make universe, make CROSS_COMPILER_PREFIX=/usr/bin/ buildworld
  Reviewed by:	imp, bapt

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Feb 18 18:30:19 2015	(r278964)
+++ head/Makefile.inc1	Wed Feb 18 19:27:51 2015	(r278965)
@@ -343,16 +343,15 @@ WMAKEENV+=	CC="${XCC} ${XCFLAGS}" CXX="$
 		SIZE="${XSIZE}"
 
 .if ${XCC:M/*}
-XFLAGS=		--sysroot=${WORLDTMP}
 .if defined(CROSS_BINUTILS_PREFIX)
 # In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a
 # directory, but the compiler will look in the right place for it's
 # tools so we don't need to tell it where to look.
 .if exists(${CROSS_BINUTILS_PREFIX})
-XFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
+BFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 .endif
 .else
-XFLAGS+=	-B${WORLDTMP}/usr/bin
+BFLAGS+=	-B${WORLDTMP}/usr/bin
 .endif
 .if ${TARGET} == "arm"
 .if ${TARGET_ARCH:M*hf*} != ""
@@ -369,6 +368,8 @@ DEPFLAGS+=	-I${WORLDTMP}/usr/include/c++
 TARGET_ABI?=	unknown
 TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
 XCFLAGS+=	-target ${TARGET_TRIPLE}
+XCFLAGS+=	--sysroot=${WORLDTMP} ${BFLAGS}
+XCXXFLAGS+=	--sysroot=${WORLDTMP} ${BFLAGS}
 .endif
 .endif