svn commit: r256915 - in head: . share/mk

[Brooks Davis]

Author: brooks
Date: Tue Oct 22 15:53:29 2013
New Revision: 256915
URL: http://svnweb.freebsd.org/changeset/base/256915

Log:
  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

Modified:
  head/Makefile.inc1
  head/share/mk/bsd.own.mk

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Oct 22 15:47:13 2013	(r256914)
+++ head/Makefile.inc1	Tue Oct 22 15:53:29 2013	(r256915)
@@ -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

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Tue Oct 22 15:47:13 2013	(r256914)
+++ head/share/mk/bsd.own.mk	Tue Oct 22 15:53:29 2013	(r256915)
@@ -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"