D3381.id8006.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3381.id8006.diff
View Options

	Index: head/Makefile.inc1
	===================================================================
	--- head/Makefile.inc1
	+++ head/Makefile.inc1
	@@ -1493,6 +1493,8 @@
	.if ${XAS:M/*} == ""
	.if ${MK_BINUTILS_BOOTSTRAP} != "no"
	_binutils= gnu/usr.bin/binutils
	+.endif
	+.if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
	_elftctools= lib/libelftc \
	usr.bin/elfcopy \
	usr.bin/nm \
	@@ -1502,7 +1504,7 @@
	# cross-build on a FreeBSD 10 host:
	_elftctools+= usr.bin/addr2line
	.endif
	-.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_BINUTILS_BOOTSTRAP} != "no"
	+.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
	# If cross-building with an external binutils we still need to build strip for
	# the target (for at least crunchide).
	_elftctools= lib/libelftc \
	Index: head/share/mk/src.opts.mk
	===================================================================
	--- head/share/mk/src.opts.mk
	+++ head/share/mk/src.opts.mk
	@@ -80,6 +80,7 @@
	DYNAMICROOT \
	ED_CRYPTO \
	EE \
	+ ELFTOOLCHAIN_BOOTSTRAP \
	EXAMPLES \
	FDT \
	FILE \
	@@ -328,6 +329,7 @@
	.if ${MK_CROSS_COMPILER} == "no"
	MK_BINUTILS_BOOTSTRAP:= no
	MK_CLANG_BOOTSTRAP:= no
	+MK_ELFTOOLCHAIN_BOOTSTRAP:= no
	MK_GCC_BOOTSTRAP:= no
	.endif