share/mk: Deduplicate some handling of debug info
ClosedPublic
Actions

Authored by markj on Aug 7 2025, 8:27 PM.

Details

Reviewers

emaste
sjg
brooks
bdrewery

Commits

rG3a239e46c4aa: share/mk: Deduplicate some handling of debug info

Summary

bsd.prog.mk and bsd.lib.mk contain a bunch of duplicated logic used to
handle DEBUG_FLAGS and standalone debug file info (enabled by
MK_DEBUG_FILES). In anticipation of adding more duplicated logic, let's
try factoring it out into a separate bsd.debug.mk first.

bsd.debug.mk now handles the following:

MK_ASSERT_DEBUG
installation rules for debug files (the consumer has to set DEBUGFILE)
updating CFLAGS and CXXFLAGS based on DEBUG_FLAGS
optionally stripping installed files

No functional change intended.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 66119
Build 63002: arc lint + arc unit

Event Timeline

markj created this revision.Aug 7 2025, 8:27 PM

Herald added subscribers: imp, bdrewery. · View Herald TranscriptAug 7 2025, 8:27 PM

markj requested review of this revision.Aug 7 2025, 8:27 PM

Harbormaster completed remote builds in B66073: Diff 159995.Aug 7 2025, 8:27 PM

markj mentioned this in D50951: share/mk: Substitute reproducible prefixes in dwarf info.Aug 7 2025, 8:29 PM

Seems okay. Be sure to test a bsd.progs.mk user too.

This revision is now accepted and ready to land.Aug 7 2025, 8:33 PM

I tested this by doing a reproducible buildworld+installworld, with and without the patch. I ran diff -r to look for differences in the installed directories. The only ones are in /rescue binaries. This is due to a small behaviour changes here which I think is harmless: before, bsd.prog.mk would not add DEBUG_FLAGS to CFLAGS if CRUNCH_CFLAGS was set. (But bsd.lib.mk added it regardless.) So now bsd.prog.mk behaves like bsd.lib.mk, i.e., we don't do anything special for crunchgen binaries. That is, rescue files are built with -g and stripped, resulting in slightly different executables.