diff options
| author | brooks <brooks@FreeBSD.org> | 2013-10-22 15:53:29 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2013-10-22 15:53:29 +0000 |
| commit | 715a26c72a608e4b4a85a03e0916e6a49e4d6db3 (patch) | |
| tree | c34c141402700c54d6f4531404a45d5d64047b46 /Makefile.inc1 | |
| parent | 71d461451d91c0ecbe026b19c7590364f30d9326 (diff) | |
| download | FreeBSD-src-715a26c72a608e4b4a85a03e0916e6a49e4d6db3.zip FreeBSD-src-715a26c72a608e4b4a85a03e0916e6a49e4d6db3.tar.gz | |
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.
MFC after: 1 week
Sponsored by: DARPA/AFRL
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 5e69ec5..b205f54 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1377,12 +1377,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 |
