D15836.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D15836.id.diff
View Options

	Index: head/Makefile.inc1
	===================================================================
	--- head/Makefile.inc1
	+++ head/Makefile.inc1
	@@ -586,7 +586,7 @@
	# 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" \
	Index: head/gnu/usr.bin/binutils/ld/Makefile
	===================================================================
	--- head/gnu/usr.bin/binutils/ld/Makefile
	+++ head/gnu/usr.bin/binutils/ld/Makefile
	@@ -7,8 +7,10 @@
	.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 @@

	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\"
	Index: head/usr.bin/clang/lld/Makefile
	===================================================================
	--- head/usr.bin/clang/lld/Makefile
	+++ head/usr.bin/clang/lld/Makefile
	@@ -8,7 +8,8 @@
	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