svn commit: r322811 - head

Ed Maste emaste at FreeBSD.org
Wed Aug 23 12:47:12 UTC 2017


Author: emaste
Date: Wed Aug 23 12:47:10 2017
New Revision: 322811
URL: https://svnweb.freebsd.org/changeset/base/322811

Log:
  Set MK_LLD_IS_LD to MK_LLD_BOOTSTRAP for cross-tools
  
  LLD_BOOTSTRAP is intended to control the linker used to link world and
  kernel, while LLD_IS_LD is intended to control the linker installed in
  that world.
  
  Force LLD_IS_LD equal to LLD_BOOTSTRAP for the cross-tools build and
  install phase, so that lld will be installed as the ld to run on the
  host, when LLD_BOOTSTRAP is set.
  
  PR:		221543
  Reviewed by:	dim
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D12072

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Aug 23 12:09:37 2017	(r322810)
+++ head/Makefile.inc1	Wed Aug 23 12:47:10 2017	(r322811)
@@ -557,7 +557,7 @@ TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		MK_GDB=no MK_TESTS=no
+		MK_GDB=no MK_LLD_IS_LD=${MK_LLD_BOOTSTRAP} MK_TESTS=no
 
 # kernel-tools stage
 KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \


More information about the svn-src-head mailing list