Author: arichardson
Date: Tue Nov 6 09:36:59 2018
New Revision: 340176
URL: https://svnweb.freebsd.org/changeset/base/340176
Log:
Remove btxld from symlinked host tools
It is only present on amd64/i386 systems which breaks buildworld on
other hosts. In fact there is no need to add it to the bootstrap tools
list since it is already included in the cross-tools phase.
However, for cross-tools it was only built if the host and target
architecture didn't match. After this change it is also built when we
are builtin with a strict $PATH.
Reported By: mmel
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Tue Nov 6 07:41:32 2018 (r340175)
+++ head/Makefile.inc1 Tue Nov 6 09:36:59 2018 (r340176)
@@ -2204,7 +2204,6 @@ _basic_bootstrap_tools+=usr.bin/unifdef
.endif
.if ${MK_BOOT} != "no"
-_basic_bootstrap_tools+=usr.sbin/btxld
_basic_bootstrap_tools+=bin/dd
# xz/unxz is used by EFI
_basic_bootstrap_tools_multilink+=usr.bin/xz xz,unxz
@@ -2375,7 +2374,7 @@ kernel-tools: .PHONY
# we get done with the earlier stages. It is the last set of tools needed
# to begin building the target binaries.
#
-.if ${TARGET_ARCH} != ${MACHINE_ARCH}
+.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BUILD_WITH_STRICT_TMPPATH} != 0
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
_btxld= usr.sbin/btxld
.endif
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
