diff options
| author | dim <dim@FreeBSD.org> | 2012-03-04 21:36:18 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-03-04 21:36:18 +0000 |
| commit | 71d521a662dac5254c0476e328e5af8071d5b06c (patch) | |
| tree | d936d80696e648870ab9abfb18b4f7d5302d2b26 /Makefile.inc1 | |
| parent | 69f995371f862106926af639c1f29c1842d84591 (diff) | |
| download | FreeBSD-src-71d521a662dac5254c0476e328e5af8071d5b06c.zip FreeBSD-src-71d521a662dac5254c0476e328e5af8071d5b06c.tar.gz | |
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
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index f7ee6a9..380038c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 |
