Author: dim
Date: Sun Mar 4 21:36:18 2012
New Revision: 232522
URL: http://svn.freebsd.org/changeset/base/232522
Log:
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
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Sun Mar 4 21:31:13 2012 (r232521)
+++ head/Makefile.inc1 Sun Mar 4 21:36:18 2012 (r232522)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
