From f936a2e55630cb53b6dc3e042f4117c255093a8c Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 22 Oct 2013 15:53:29 +0000
Subject: [PATCH] Stop conflating WITHOUT_CLANG with WITHOUT_CLANG_IS_CC.  This
 allows bootstrapping a copy of clang without building clang for the base
 system which is useful for nanobsd and similar setups.  It's still probably
 wrong to conflate what is installed as /usr/bin/cc with the selection of a
 bootstrap compiler under WITH*_CLANG_IS_CC, but that's for another day.

MFC after:	1 week
Sponsored by:	DARPA/AFRL
---
 Makefile.inc1       | 6 ++----
 share/mk/bsd.own.mk | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 5e69ec55bf9b..b205f541f3c6 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1377,12 +1377,10 @@ _binutils=	gnu/usr.bin/binutils
 # If an full path to an external cross compiler is given, don't build
 # a cross compiler.
 .if ${XCC:M/*} == "" && ${MK_CROSS_COMPILER} != "no"
-.if ${MK_CLANG} != "no" && (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang")
+.if (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && ${TARGET} != "pc98"
 _clang=		usr.bin/clang
 _clang_libs=	lib/clang
-.endif
-
-.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
+.else
 _cc=		gnu/usr.bin/cc
 .endif
 .endif
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index a1b6c4412c8e..e3cb237068ec 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -554,7 +554,6 @@ MK_GDB:=	no
 .if ${MK_CLANG} == "no"
 MK_CLANG_EXTRAS:= no
 MK_CLANG_FULL:= no
-MK_CLANG_IS_CC:= no
 .endif
 
 .if ${MK_CLANG_IS_CC} == "no"