svn commit: r301394 - head

[Bryan Drewery]

Author: bdrewery
Date: Sat Jun  4 17:17:10 2016
New Revision: 301394
URL: https://svnweb.freebsd.org/changeset/base/301394

Log:
  Follow-up r301287: Pass external compiler metadata when used.
  
  This fixes WITH_SYSTEM_COMPILER, WITHOUT_CROSS_COMPILER, external compiler, to
  pass the external compiler metadata rather than the ${CC} metadata.  On
  a build host that has clang as CC it was passing the clang metadata rather than
  GCC metadata during the build.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat Jun  4 17:16:35 2016	(r301393)
+++ head/Makefile.inc1	Sat Jun  4 17:17:10 2016	(r301394)
@@ -129,9 +129,15 @@ MK_GCC_BOOTSTRAP=	no
 # passed along rather than trying to run cc from the restricted
 # STRICTTMPPATH.
 .if ${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no"
+.if defined(X_COMPILER_TYPE)
 CROSSENV+=	COMPILER_VERSION=${COMPILER_VERSION} \
 		COMPILER_TYPE=${COMPILER_TYPE} \
 		COMPILER_FREEBSD_VERSION=${COMPILER_FREEBSD_VERSION}
+.else
+CROSSENV+=	COMPILER_VERSION=${X_COMPILER_VERSION} \
+		COMPILER_TYPE=${X_COMPILER_TYPE} \
+		COMPILER_FREEBSD_VERSION=${X_COMPILER_FREEBSD_VERSION}
+.endif
 .endif
 
 # Handle external binutils.