svn commit: r356892 - head/share/mk

Ed Maste emaste at FreeBSD.org
Sun Jan 19 19:56:06 UTC 2020


Author: emaste
Date: Sun Jan 19 19:56:05 2020
New Revision: 356892
URL: https://svnweb.freebsd.org/changeset/base/356892

Log:
  src.opts.mk: default BINUTILS_BOOTSTRAP to NO except for x86 and powerpc
  
  x86 needs bootstrap GNU as for assembling a few files, and powerpc needs
  GNU ld.bfd for linking 32-bit objects.  All other targets either fully
  use in-tree Clang and lld, or rely on external toolchain.
  
  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	Sun Jan 19 19:51:20 2020	(r356891)
+++ head/share/mk/src.opts.mk	Sun Jan 19 19:56:05 2020	(r356892)
@@ -63,7 +63,6 @@ __DEFAULT_YES_OPTIONS = \
     AUTOFS \
     BHYVE \
     BINUTILS \
-    BINUTILS_BOOTSTRAP \
     BLACKLIST \
     BLUETOOTH \
     BOOT \
@@ -313,6 +312,11 @@ __DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_IS_C
 # In-tree binutils/gcc are older versions without modern architecture support.
 .if ${__T} == "aarch64" || ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GCC GCC_BOOTSTRAP GDB
+.endif
+.if ${__T} == "amd64" || ${__T} == "i386" || ${__T:Mpowerpc*}
+__DEFAULT_YES_OPTIONS+=BINUTILS_BOOTSTRAP
+.else
+__DEFAULT_NO_OPTIONS+=BINUTILS_BOOTSTRAP
 .endif
 .if ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=OFED


More information about the svn-src-all mailing list