diff options
| author | brooks <brooks@FreeBSD.org> | 2013-10-31 14:07:00 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2013-10-31 14:07:00 +0000 |
| commit | c8322d287bbd0b68a2e93cc9c2a070c11fb49560 (patch) | |
| tree | eaca9aa49579e8bfdbe9596b94c9ae64010557e2 | |
| parent | 1fe9c90df1d9c0f555cf343210da749b63df14e2 (diff) | |
| download | FreeBSD-src-c8322d287bbd0b68a2e93cc9c2a070c11fb49560.zip FreeBSD-src-c8322d287bbd0b68a2e93cc9c2a070c11fb49560.tar.gz | |
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)
| -rw-r--r-- | Makefile.inc1 | 6 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 413fe63..de4b1a5 100644 --- a/Makefile.inc1 +++ b/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 diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index a1b6c44..e3cb237 100644 --- a/share/mk/bsd.own.mk +++ b/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" |
