svn commit: r354536 - head

Ed Maste emaste at FreeBSD.org
Fri Nov 8 14:06:49 UTC 2019


Author: emaste
Date: Fri Nov  8 14:06:48 2019
New Revision: 354536
URL: https://svnweb.freebsd.org/changeset/base/354536

Log:
  suggest xtoolchain package if binutils and GCC bootstraps are both broken
  
  Previously we checked for only BINUTILS_BOOTSTRAP as a broken option
  and suggested installing the binutils package.  This was originally done
  for arm64 where we used the in-tree Clang with external binutils package.
  
  Add a case to the warning to suggest instead the full xtoolchain package
  if we have no in-tree compiler either.
  
  Differential Revision:	https://reviews.freebsd.org/D21851

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Nov  8 12:19:03 2019	(r354535)
+++ head/Makefile.inc1	Fri Nov  8 14:06:48 2019	(r354536)
@@ -189,7 +189,11 @@ CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
     !defined(CROSS_BINUTILS_PREFIX)
 CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_TRIPLE}/bin/
 .if !exists(${CROSS_BINUTILS_PREFIX})
+.if !empty(BROKEN_OPTIONS:MGCC_BOOTSTRAP) && ${MK_CLANG_BOOTSTRAP} == "no"
+.error In-tree toolchain does not support the ${TARGET_ARCH} architecture. Install the ${TARGET_ARCH}-xtoolchain-gcc port or package or set CROSS_TOOLCHAIN_PREFIX.
+.else
 .error In-tree binutils does not support the ${TARGET_ARCH} architecture. Install the ${TARGET_ARCH}-binutils port or package or set CROSS_BINUTILS_PREFIX.
+.endif
 .endif
 .endif
 .endif


More information about the svn-src-all mailing list