svn commit: r361648 - head/share/mk

[Ed Maste]

Author: emaste
Date: Sat May 30 16:12:00 2020
New Revision: 361648
URL: https://svnweb.freebsd.org/changeset/base/361648

Log:
  Disable BINUTILS by default on amd64
  
  The retirement of obsolete binutils 2.17.50 has been in progress for
  quite some time.  All tools other than GNU as were removed prior to this
  commit, and it was built only on amd64 - installed as /usr/bin/as, and
  used as a bootstrap tool.
  
  The amd64 exp-run has completed and failures have now been addressed in
  the individual ports, so disable it by default.
  
  PR:		233611, 205250 [exp-run]
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Sat May 30 16:00:49 2020	(r361647)
+++ head/share/mk/src.opts.mk	Sat May 30 16:12:00 2020	(r361648)
@@ -200,6 +200,7 @@ __DEFAULT_YES_OPTIONS = \
 __DEFAULT_NO_OPTIONS = \
     BEARSSL \
     BHYVE_SNAPSHOT \
+    BINUTILS \
     BSD_GREP \
     CLANG_EXTRAS \
     DTRACE_TESTS \
@@ -290,12 +291,11 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF
 .if ${__T} == "aarch64" || ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GDB
 .endif
-# BINUTILS is enabled on amd64 to provide as for ports - PR 205250
 # BINUTILS_BOOTSTRAP is needed on amd64 only, for skein_block_asm.s
 .if ${__T} == "amd64"
-__DEFAULT_YES_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP
+__DEFAULT_YES_OPTIONS+=BINUTILS_BOOTSTRAP
 .else
-__DEFAULT_NO_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP
+__DEFAULT_NO_OPTIONS+=BINUTILS_BOOTSTRAP
 .endif
 .if ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=OFED