aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2019-12-27 16:59:26 +0000
committerEd Maste <emaste@FreeBSD.org>2019-12-27 16:59:26 +0000
commitcb9da00eb7704edc7e8a6e80d6fa7727ac156fac (patch)
tree0fbd49309aff8634f238c28932645809b3e9d440 /share
parent4085590d39e38cd1cbbf34dcb2efe2ef71895f90 (diff)
downloadsrc-cb9da00eb7704edc7e8a6e80d6fa7727ac156fac.tar.gz
src-cb9da00eb7704edc7e8a6e80d6fa7727ac156fac.zip
Switch GPL_DTC to default off
We use the BSDL devicetree compiler as long as we have a C++11 compiler. dtc is not needed as a build tool on the platforms that are still using GCC 4.2.1 (and it is being disabled very soon, anyhow). Discussed with: imp, kevans
Notes
Notes: svn path=/head/; revision=356127
Diffstat (limited to 'share')
-rw-r--r--share/mk/src.opts.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index b6cba1e64222..9db7ee14d6f9 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -200,6 +200,7 @@ __DEFAULT_NO_OPTIONS = \
DTRACE_TESTS \
EXPERIMENTAL \
GNU_GREP_COMPAT \
+ GPL_DTC \
HESIOD \
HTTPD \
LIBSOFT \
@@ -308,16 +309,16 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF
${__TT} != "riscv" && ${__TT} != "sparc64")
# Clang is enabled, and will be installed as the default /usr/bin/cc.
__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_IS_CC LLD
-__DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX GPL_DTC
+__DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
.elif ${COMPILER_FEATURES:Mc++11} && ${__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 GCC GCC_BOOTSTRAP GNUCXX GPL_DTC LLD
+__DEFAULT_YES_OPTIONS+=CLANG GCC GCC_BOOTSTRAP GNUCXX LLD
__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC
.else
# Everything else disables Clang, and uses GCC instead.
-__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX GPL_DTC
+__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
__DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_IS_CC LLD
.endif
# In-tree binutils/gcc are older versions without modern architecture support.