svn commit: r257449 - in stable/10: . share/mk

[Brooks Davis]

Author: brooks
Date: Thu Oct 31 14:07:00 2013
New Revision: 257449
URL: http://svnweb.freebsd.org/changeset/base/257449

Log:
  MFC r256915
  
  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.
  
  Sponsored by:	DARPA/AFRL
  Approved by:	re (gjb)

Modified:
  stable/10/Makefile.inc1   (contents, props changed)
  stable/10/share/mk/bsd.own.mk
Directory Properties:
  stable/10/share/mk/   (props changed)
  stable/10/tools/build/options/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Thu Oct 31 13:57:11 2013	(r257448)
+++ stable/10/Makefile.inc1	Thu Oct 31 14:07:00 2013	(r257449)
@@ -1381,12 +1381,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: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk	Thu Oct 31 13:57:11 2013	(r257448)
+++ stable/10/share/mk/bsd.own.mk	Thu Oct 31 14:07:00 2013	(r257449)
@@ -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"