Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 31 Oct 2018 18:08:12 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r339964 - head
Message-ID:  <201810311808.w9VI8CAQ049738@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Wed Oct 31 18:08:12 2018
New Revision: 339964
URL: https://svnweb.freebsd.org/changeset/base/339964

Log:
  Avoid binutils test in cleandir/obj stages
  
  Further to r339946 skip the .error case for lack of in-tree binutils
  support when we haven't set the toolchain feature variables.
  
  Discussed with:	arichardson
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Oct 31 18:01:02 2018	(r339963)
+++ head/Makefile.inc1	Wed Oct 31 18:08:12 2018	(r339964)
@@ -183,7 +183,7 @@ CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
 # support the target architecture), provide a default cross-binutils prefix.
 # This allows riscv64 builds, for example, to automatically use the
 # riscv64-binutils port or package.
-.if !make(showconfig)
+.if !make(showconfig) && !defined(_NO_INCLUDE_COMPILERMK)
 .if !empty(BROKEN_OPTIONS:MBINUTILS_BOOTSTRAP) && \
     ${MK_LLD_BOOTSTRAP} == "no" && \
     !defined(CROSS_BINUTILS_PREFIX)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810311808.w9VI8CAQ049738>