d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove btxld from symlinked host tools

Browse Source 
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
This commit is contained in:
Alex Richardson 2018-11-06 09:36:59 +00:00
parent 8f47ad010c
commit 4805dd68d6
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.inc1
View File

@ -2204,7 +2204,6 @@ _basic_bootstrap_tools+=usr.bin/unifdef
.endif .endif
.if ${MK_BOOT} != "no" .if ${MK_BOOT} != "no"
_basic_bootstrap_tools+=usr.sbin/btxld
_basic_bootstrap_tools+=bin/dd _basic_bootstrap_tools+=bin/dd
# xz/unxz is used by EFI # xz/unxz is used by EFI
_basic_bootstrap_tools_multilink+=usr.bin/xz xz,unxz _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 # we get done with the earlier stages. It is the last set of tools needed
# to begin building the target binaries. # 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" .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
_btxld= usr.sbin/btxld _btxld= usr.sbin/btxld
.endif .endif