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

Build the elftoolchain libraries as part of bootstrap-tools

Browse Source 
It is not necessary to build libelf and libdwarf this early. Furthermore,
when building on Linux/MacOS, m4 will only be built during the bootstrap
tools phase and not be available in $PATH before.

Reviewed By:	emaste
Approved By:	brooks (mentor)
Differential Revision: https://reviews.freebsd.org/D17800
This commit is contained in:
Alex Richardson 2018-11-05 19:51:16 +00:00
parent 8f62bca488
commit 6806504da4
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile.inc1
View File

@ -1967,15 +1967,6 @@ update: .PHONY
# build-tools or cross-tools. # build-tools or cross-tools.
# #
# ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
# r296685 fix cross-endian objcopy
# r310724 fixed PR 215350, a crash in libdwarf with objects built by GCC 6.2.
# r334881 added libdwarf constants used by ctfconvert.
# r338478 fixed a crash in objcopy for mips64el objects
# r339083 libelf: correct mips64el test to use ELF header
.if ${BOOTSTRAPPING} < 1200085
_elftoolchain_libs= lib/libelf lib/libdwarf
.endif
# libnv and libl are both requirements for config(8), which is an unconditional # libnv and libl are both requirements for config(8), which is an unconditional
# bootstrap-tool. # bootstrap-tool.
@ -1987,7 +1978,7 @@ legacy: .PHONY
false false
.endif .endif
.for _tool in tools/build ${_elftoolchain_libs} ${_config_deps} .for _tool in tools/build ${_config_deps}
${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,all,install)"; \ ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,all,install)"; \
cd ${.CURDIR}/${_tool}; \ cd ${.CURDIR}/${_tool}; \
if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \
@ -2001,7 +1992,8 @@ legacy: .PHONY
# bootstrap-tools: Build tools needed for compatibility. These are binaries that # bootstrap-tools: Build tools needed for compatibility. These are binaries that
# are built to build other binaries in the system. However, the focus of these # are built to build other binaries in the system. However, the focus of these
# binaries is usually quite narrow. Bootstrap tools use the host's compiler and # binaries is usually quite narrow. Bootstrap tools use the host's compiler and
# libraries, augmented by -legacy. # libraries, augmented by -legacy, in addition to the libraries built during
# bootstrap-tools.
# #
_bt= _bootstrap-tools _bt= _bootstrap-tools
@ -2052,11 +2044,24 @@ _lex= usr.bin/lex
# Note: lex needs m4 to build but m4 also depends on lex. However, lex can be # Note: lex needs m4 to build but m4 also depends on lex. However, lex can be
# bootstrapped so we build lex first. # bootstrapped so we build lex first.
${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd ${_bt}-usr.bin/yacc ${_bt}-${_lex} ${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd ${_bt}-usr.bin/yacc ${_bt}-${_lex}
_bt_lex_depend=${_bt}-usr.bin/lex ${_bt}-usr.bin/m4 _bt_m4_depend=${_bt}-${_m4}
_bt_lex_depend=${_bt}-${_lex} ${_bt_m4_depend}
.else .else
_bootstrap_tools_links+=m4 lex _bootstrap_tools_links+=m4 lex
.endif .endif
# ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
# r296685 fix cross-endian objcopy
# r310724 fixed PR 215350, a crash in libdwarf with objects built by GCC 6.2.
# r334881 added libdwarf constants used by ctfconvert.
# r338478 fixed a crash in objcopy for mips64el objects
# r339083 libelf: correct mips64el test to use ELF header
.if ${BOOTSTRAPPING} < 1200085
_elftoolchain_libs= lib/libelf lib/libdwarf
${_bt}-lib/libelf: ${_bt_m4_depend}
${_bt}-lib/libdwarf: ${_bt_m4_depend}
.endif
# r245440 mtree -N support added # r245440 mtree -N support added
# r313404 requires sha384.h for libnetbsd, added to libmd in r292782 # r313404 requires sha384.h for libnetbsd, added to libmd in r292782
.if ${BOOTSTRAPPING} < 1100093 .if ${BOOTSTRAPPING} < 1100093
@ -2264,6 +2269,7 @@ bootstrap-tools: ${_bt}-links .PHONY
${_dtc} \ ${_dtc} \
${_cat} \ ${_cat} \
${_kbdcontrol} \ ${_kbdcontrol} \
${_elftoolchain_libs} \
usr.bin/lorder \ usr.bin/lorder \
lib/libopenbsd \ lib/libopenbsd \
usr.bin/mandoc \ usr.bin/mandoc \