Fix bootstrap on systems with old libdwarf and WITHOUT_CDDL
ELF Tool Chain tools need libelf and libdwarf. Submitted by: jmallett (earlier version) Reviewed by: jmallett Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
b9a1285191
commit
8b817932f7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=277517
@ -1292,12 +1292,16 @@ _clang_tblgen= \
|
|||||||
usr.bin/clang/clang-tblgen
|
usr.bin/clang/clang-tblgen
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
# ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
|
||||||
# dtrace tools are required for older bootstrap env and cross-build
|
# dtrace tools are required for older bootstrap env and cross-build
|
||||||
# pre libdwarf
|
# pre libdwarf
|
||||||
.if ${MK_CDDL} != "no" && (${BOOTSTRAPPING} < 1100006 \
|
.if ${BOOTSTRAPPING} < 1100006 || (${MACHINE} != ${TARGET} || \
|
||||||
|| (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH}))
|
${MACHINE_ARCH} != ${TARGET_ARCH})
|
||||||
_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
|
_elftoolchain_libs= lib/libelf lib/libdwarf
|
||||||
lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
|
.if ${MK_CDDL} != "no"
|
||||||
|
_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf cddl/usr.bin/ctfconvert \
|
||||||
|
cddl/usr.bin/ctfmerge
|
||||||
|
.endif
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# Default to building the GPL DTC, but build the BSDL one if users explicitly
|
# Default to building the GPL DTC, but build the BSDL one if users explicitly
|
||||||
@ -1324,6 +1328,7 @@ bootstrap-tools: .MAKE
|
|||||||
.for _tool in \
|
.for _tool in \
|
||||||
${_clang_tblgen} \
|
${_clang_tblgen} \
|
||||||
${_kerberos5_bootstrap_tools} \
|
${_kerberos5_bootstrap_tools} \
|
||||||
|
${_elftoolchain_libs} \
|
||||||
${_dtrace_tools} \
|
${_dtrace_tools} \
|
||||||
${_strfile} \
|
${_strfile} \
|
||||||
${_gperf} \
|
${_gperf} \
|
||||||
|
Loading…
Reference in New Issue
Block a user