From 5e07d0314f239321c3c7625b68484cadcb540cfa Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 4 Mar 2012 21:36:18 +0000
Subject: [PATCH] Fix a thinko in r232322, where gcc (and its tools) are not
 built during the cross-tools stage, if CC=clang and WITH_CLANG_IS_CC is not
 set.

This causes no 'cc' to be installed in the temporary cross-tools tree,
making lint fall over later in the build, because it ignores ${CC} and
attempts to run 'cc' anyway.

To fix this, only skip building gcc during cross-tools, if WITHOUT_GCC
is set, or if WITH_CLANG_IS_CC is set.

Pointy hat to:	dim
MFC after:	2 weeks
---
 Makefile.inc1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index f7ee6a994295..380038cfa01c 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1108,7 +1108,7 @@ _aicasm= sys/modules/aic7xxx/aicasm
 _share=	share/syscons/scrnmaps
 .endif
 
-.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang")
+.if ${MK_GCC} != "no" && ${MK_CLANG_IS_CC} == "no"
 _gcc_tools= gnu/usr.bin/cc/cc_tools
 .endif
 
@@ -1175,7 +1175,7 @@ _clang=		usr.bin/clang
 _clang_libs=	lib/clang
 .endif
 
-.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang")
+.if ${MK_GCC} != "no" && ${MK_CLANG_IS_CC} == "no"
 _cc=		gnu/usr.bin/cc
 .endif