svn commit: r356127 - head/share/mk

Ed Maste emaste at FreeBSD.org
Fri Dec 27 16:59:27 UTC 2019


Author: emaste
Date: Fri Dec 27 16:59:26 2019
New Revision: 356127
URL: https://svnweb.freebsd.org/changeset/base/356127

Log:
  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

Modified:
  head/share/mk/src.opts.mk

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Fri Dec 27 16:43:34 2019	(r356126)
+++ head/share/mk/src.opts.mk	Fri Dec 27 16:59:26 2019	(r356127)
@@ -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.


More information about the svn-src-head mailing list