From b4dd4229260fcb1b0114205fe181ac6d1491559e Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 4 Jun 2016 17:17:10 +0000
Subject: [PATCH] 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.
---
 Makefile.inc1 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 448c76863f3..ef1c64760ea 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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.