Permalink
Browse files

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)
  • Loading branch information...
1 parent 1fe9c90 commit c8322d287bbd0b68a2e93cc9c2a070c11fb49560 @brooksdavis brooksdavis committed Oct 31, 2013
Showing with 2 additions and 5 deletions.
  1. +2 −4 Makefile.inc1
  2. +0 −1 share/mk/bsd.own.mk
View
6 Makefile.inc1
@@ -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
View
1 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"

0 comments on commit c8322d2

Please sign in to comment.