From 1e212edbd475bf7ebbf46e21095c9a978cd99a0c Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Mon, 7 Aug 2017 16:23:53 +0000
Subject: [PATCH] Follow-up to r321684 (Don't use libc++ when cross-building
 for gcc arches), and handle two more cases where libc++ includes could be
 incorrectly enabled, in case the host compiler is clang 5.0.0, and the target
 (cross) compiler is gcc 4.2.1.

Noted by:	bdrewery
MFC after:	3 days
X-MFC-With:	321684
---
 Makefile.inc1      | 3 +--
 Makefile.libcompat | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 7f72092d9966..ed9388610f17 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2742,8 +2742,7 @@ CD2CFLAGS+=	-isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib
 # combined with --sysroot.
 CD2CFLAGS+=	-B${XDDESTDIR}/usr/lib
 # Force using libc++ for external GCC.
-# XXX: This should be checking MK_GNUCXX == no
-.if ${X_COMPILER_VERSION} >= 40800
+.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800
 CD2CXXFLAGS+=	-isystem ${XDDESTDIR}/usr/include/c++/v1 -std=c++11 \
 		-nostdinc++
 .endif
diff --git a/Makefile.libcompat b/Makefile.libcompat
index 3c0aabb2d05f..8542d5b246ae 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -99,8 +99,7 @@ LIBCOMPATCFLAGS+=	-B${LIBCOMPATTMP}/usr/lib${libcompat}
 # sysroot path which --sysroot does not actually do for headers.
 LIBCOMPATCFLAGS+=	-isystem ${LIBCOMPATTMP}/usr/include
 # Force using libc++ for external GCC.
-# XXX: This should be checking MK_GNUCXX == no
-.if ${X_COMPILER_VERSION} >= 40800 && \
+.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 && \
     (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no")
 LIBCOMPATCXXFLAGS+=	-isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \
 			-nostdinc++