diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2017-06-20 15:51:09 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2017-06-20 15:51:09 +0000 |
| commit | a793c109aeb4a1546560011244dc04d45cc86cf0 (patch) | |
| tree | ce0245aaa39eb4d88a52d9185836a227bcc63db0 /share | |
| parent | af2ae31d933c51adacebf66520d7bce89694dbf5 (diff) | |
Notes
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/src.opts.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 9de6168d083d..6c166fc667e4 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -180,7 +180,6 @@ __DEFAULT_NO_OPTIONS = \ CLANG_EXTRAS \ DTRACE_TESTS \ GNU_GREP_COMPAT \ - GPL_DTC \ HESIOD \ LIBSOFT \ NAND \ @@ -222,16 +221,16 @@ __TT=${MACHINE} ${__T} == "amd64" || ${__TT} == "arm" || ${__T} == "i386") # Clang is enabled, and will be installed as the default /usr/bin/cc. __DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC LLD -__DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX +__DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX GPL_DTC .elif ${COMPILER_FEATURES:Mc++11} && ${__T} != "riscv64" && ${__T} != "sparc64" # If an external compiler that supports C++11 is used as ${CC} and Clang # supports the target, then Clang is enabled but GCC is installed as the # default /usr/bin/cc. __DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX -__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC LLD +__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC GPL_DTC LLD .else # Everything else disables Clang, and uses GCC instead. -__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX +__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX GPL_DTC __DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC LLD .endif # In-tree binutils/gcc are older versions without modern architecture support. |