svn commit: r335447 - in head: . gnu/usr.bin/binutils/ld usr.bin/clang/lld

[Bryan Drewery]

Author: bdrewery
Date: Wed Jun 20 16:10:02 2018
New Revision: 335447
URL: https://svnweb.freebsd.org/changeset/base/335447

Log:
  Rework how the ld link is handled in WORLDTMP from r322811.
  
  LLD_BOOTSTRAP (build) is independent of LLD_IS_LD (installed) so they
  should not be based on each other.
  
  This is related to upcoming WITH_SYSTEM_LINKER work.
  
  Reviewed by:	emaste
  Sponsored by:	Dell EMC
  Differential Revision:	https://reviews.freebsd.org/D15836

Modified:
  head/Makefile.inc1
  head/gnu/usr.bin/binutils/ld/Makefile
  head/usr.bin/clang/lld/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Jun 20 16:07:35 2018	(r335446)
+++ head/Makefile.inc1	Wed Jun 20 16:10:02 2018	(r335447)
@@ -586,7 +586,7 @@ TMAKE=		\
 # TOOLS_PREFIX set in BMAKE
 XMAKE=		${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		MK_GDB=no MK_LLD_IS_LD=${MK_LLD_BOOTSTRAP} MK_TESTS=no
+		MK_GDB=no MK_TESTS=no
 
 # kernel-tools stage
 KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \

Modified: head/gnu/usr.bin/binutils/ld/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/ld/Makefile	Wed Jun 20 16:07:35 2018	(r335446)
+++ head/gnu/usr.bin/binutils/ld/Makefile	Wed Jun 20 16:10:02 2018	(r335447)
@@ -7,8 +7,10 @@ ELF_SCR_EXT=	x xbn xc xd xdc xdw xn xr xs xsc xsw xu x
 .PATH: ${SRCDIR}/ld
 
 PROG=	ld.bfd
-.if ${MK_LLD_IS_LD} == "no"
+.if (!defined(TOOLS_PREFIX) && ${MK_LLD_IS_LD} == "no") || \
+    (defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} == "no")
 MAN=	ld.1
+LINKS=		${BINDIR}/ld.bfd ${BINDIR}/ld
 .else
 MAN=	ld.bfd.1
 CLEANFILES+=	ld.bfd.1
@@ -57,9 +59,6 @@ CLEANFILES+=	ldemul-list.h stringify.sed
 
 FILES=		${LDSCRIPTS:S|^|ldscripts/|}
 FILESDIR=	${SCRIPTDIR}
-.if ${MK_LLD_IS_LD} == "no"
-LINKS=		${BINDIR}/ld.bfd ${BINDIR}/ld
-.endif
 
 HOST=		${TARGET_TUPLE}
 LIBSEARCHPATH=	\"=/lib\":\"=/usr/lib\"

Modified: head/usr.bin/clang/lld/Makefile
==============================================================================
--- head/usr.bin/clang/lld/Makefile	Wed Jun 20 16:07:35 2018	(r335446)
+++ head/usr.bin/clang/lld/Makefile	Wed Jun 20 16:10:02 2018	(r335447)
@@ -8,7 +8,8 @@ LLD_SRCS=	${LLVM_SRCS}/tools/lld
 PACKAGE=	lld
 PROG_CXX=	ld.lld
 
-.if ${MK_LLD_IS_LD} != "no"
+.if (!defined(TOOLS_PREFIX) && ${MK_LLD_IS_LD} != "no") || \
+    (defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} != "no")
 SYMLINKS=	${PROG_CXX} ${BINDIR}/ld
 MLINKS=		ld.lld.1 ld.1
 .endif