d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a thinko in r232322, where gcc (and its tools) are not built during

Browse Source 
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
This commit is contained in:
Dimitry Andric 2012-03-04 21:36:18 +00:00
parent a65f78bf2e
commit 5e07d0314f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.inc1
View File

@ -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