Makefile.inc1: Rework ELF Tool Chain bootstrapping
ClosedPublic
Actions

Authored by emaste on Tue, Mar 25, 2:33 PM.

Details

Reviewers

jhb
olce
imp
brooks

Commits

rG7d70f8b482fd: Makefile.inc1: Rework ELF Tool Chain bootstrapping

Summary

Remove additional conditions and bootstrap elfctl, elfdump, and elfcopy
(aka objdump) if ELFTOOLCHAIN_BOOTSTRAP is true.  The first two are
bespoke tools that won't exist in an external GNU or LLVM binutils, and
elfcopy is also not provided by that name.

This should fix GCC CI builds, which was skipping the elfcopy build
because of the ${TARGET_ARCH} != ${MACHINE_ARCH} condition.

Reported by:    olce
Fixes: b885643b63e4 ("boot: Always use ELF Tool Chain elfcopy for EFI builds")
Sponsored by:   The FreeBSD Foundation

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

emaste requested review of this revision.Tue, Mar 25, 2:33 PM

emaste created this revision.

emaste added a reviewer: brooks.Tue, Mar 25, 3:36 PM

Changes to this section over time include:

Cirrus-CI test run: https://cirrus-ci.com/build/5750132458651648

Seems fine conceptually, a couple comments.

Makefile.inc1
2914	I wonder if this comment should mention elfctl since it has other uses (I should bring over ELF_FEATURES from CheriBSD).
2922	I wonder if we should change this guard (maybe `${XNM}`) given that we don't actually use AS any more.