diff options
| author | emaste <emaste@FreeBSD.org> | 2015-07-29 19:06:53 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2015-07-29 19:06:53 +0000 |
| commit | 96ddd8837d282179ef2fe8a6a4b675c6a498b3ef (patch) | |
| tree | ae2cb8fe47047c1bbb4cd12578ea88e090fd561e /share | |
| parent | c37b88aa378b190e8fa4ea70e5dc4854cb8c5078 (diff) | |
| download | FreeBSD-src-96ddd8837d282179ef2fe8a6a4b675c6a498b3ef.zip FreeBSD-src-96ddd8837d282179ef2fe8a6a4b675c6a498b3ef.tar.gz | |
Use default CLANG build options for ARM
We previously disabled CLANG_FULL on (little-endian) ARM because the
build failed. This is no longer the case and as of Clang 3.5 we cannot
build any part of the in-tree Clang with in-tree GCC, so it's no longer
necessary to disable CLANG_FULL.
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D2525
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/src.opts.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index fb2e1c2..48c51fa 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -214,15 +214,11 @@ __TT=${MACHINE} # If the compiler is not C++11 capable, disable clang and use gcc instead. __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX __DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC -.elif ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" -# On x86 and arm64, clang is enabled, and will be installed as the default cc. +.elif ${__T} == "aarch64" || ${__T} == "amd64" || ${__TT} == "arm" || \ + ${__T} == "i386" +# On x86 and arm, clang is enabled, and will be installed as the default cc. __DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC __DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX -.elif ${__TT} == "arm" -# On arm, clang is enabled, and it is installed as the default cc, but -# since gcc is unable to build the full clang, disable it by default. -__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_IS_CC -__DEFAULT_NO_OPTIONS+=CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX .elif ${__T:Mpowerpc*} # On powerpc, clang is enabled, but gcc is installed as the default cc. __DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX |
