svn commit: r360815 - head/share/mk

[Ed Maste]

Author: emaste
Date: Fri May  8 14:54:40 2020
New Revision: 360815
URL: https://svnweb.freebsd.org/changeset/base/360815

Log:
  src.opts.mk: update BINUTILS options and add comments
  
  BINUTILS is needed only for ports, and will be disabled once the failing
  ports are addressed (likely by growing a binutils dependency).
  
  BINUTILS_BOOTSTRAP is needed only on amd64, for skein_block_asm.s. There
  is no need to enable it on i386.
  
  This will all be removed before FreeBSD 13.0.

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

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Fri May  8 14:48:45 2020	(r360814)
+++ head/share/mk/src.opts.mk	Fri May  8 14:54:40 2020	(r360815)
@@ -290,8 +290,13 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF
 .if ${__T} == "aarch64" || ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GDB
 .endif
-.if ${__T} == "amd64" || ${__T} == "i386"
+# BINUTILS is enabled on x86 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
+.elif ${__T} == "i386"
+__DEFAULT_YES_OPTIONS+=BINUTILS
+__DEFAULT_NO_OPTIONS+=BINUTILS_BOOTSTRAP
 .else
 __DEFAULT_NO_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP
 .endif