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

Move DTrace tools to cross-tools stage

Browse Source 
Bootstrap tools exist for backwards compatibility support. DTrace tools
tools are also needed for cross builds, so belong in cross-tools.

Reviewed by:	imp (earlier), markj
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D2144
This commit is contained in:
Ed Maste 2015-09-21 16:07:22 +00:00
parent 1f57d8c66b
commit b5512f3b27
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile.inc1
View File

@ -1357,16 +1357,6 @@ ${_bt}-usr.bin/clang/clang-tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/c
${_bt}-usr.bin/clang/tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/libllvmsupport ${_bt}-usr.bin/clang/tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/libllvmsupport
.endif .endif
# Rebuild ctfconvert and ctfmerge to avoid difficult-to-diagnose failures
# resulting from missing bug fixes or ELF Toolchain updates.
.if ${MK_CDDL} != "no"
_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf cddl/usr.bin/ctfconvert \
cddl/usr.bin/ctfmerge
${_bt}-cddl/usr.bin/ctfconvert: ${_bt}-cddl/lib/libctf
${_bt}-cddl/usr.bin/ctfmerge: ${_bt}-cddl/lib/libctf
.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
# request it. # request it.
_dtc= usr.bin/dtc _dtc= usr.bin/dtc
@ -1406,7 +1396,6 @@ bootstrap-tools: .PHONY
.for _tool in \ .for _tool in \
${_clang_tblgen} \ ${_clang_tblgen} \
${_kerberos5_bootstrap_tools} \ ${_kerberos5_bootstrap_tools} \
${_dtrace_tools} \
${_strfile} \ ${_strfile} \
${_gperf} \ ${_gperf} \
${_groff} \ ${_groff} \
@ -1502,6 +1491,13 @@ _btxld= usr.sbin/btxld
.endif .endif
.endif .endif
# Rebuild ctfconvert and ctfmerge to avoid difficult-to-diagnose failures
# resulting from missing bug fixes or ELF Toolchain updates.
.if ${MK_CDDL} != "no"
_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf cddl/usr.bin/ctfconvert \
cddl/usr.bin/ctfmerge
.endif
# If we're given an XAS, don't build binutils. # If we're given an XAS, don't build binutils.
.if ${XAS:M/*} == "" .if ${XAS:M/*} == ""
.if ${MK_BINUTILS_BOOTSTRAP} != "no" .if ${MK_BINUTILS_BOOTSTRAP} != "no"
@ -1545,6 +1541,7 @@ cross-tools: .MAKE
${_clang} \ ${_clang} \
${_binutils} \ ${_binutils} \
${_elftctools} \ ${_elftctools} \
${_dtrace_tools} \
${_cc} \ ${_cc} \
${_btxld} \ ${_btxld} \
${_crunchide} \ ${_crunchide} \