git: b45d14d3d665 - main - sys.mk: CTFMERGE: don't assume objfiles always have CTF sections

The branch main has been updated by siva:

URL: https://cgit.FreeBSD.org/src/commit/?id=b45d14d3d665e0253391924e5c0595c259b8a773

commit b45d14d3d665e0253391924e5c0595c259b8a773
Author:     Siva Mahadevan <siva@FreeBSD.org>
AuthorDate: 2026-10-05 20:13:16 +0000
Commit:     Siva Mahadevan <siva@FreeBSD.org>
CommitDate: 2026-10-05 20:13:36 +0000

    sys.mk: CTFMERGE: don't assume objfiles always have CTF sections
    
    There are many instances, e.g. in the kernel, where
    object files don't have CTF sections, but still need
    to be merged into one that does have a CTF section.
    
    This fixes cases like the following:
    
    --------------------------------------------------------------
    >>> stage 3.1: building everything
    --------------------------------------------------------------
    
    linking kernel.full
    ctfmerge -t -L VERSION -g -o kernel.full ...
    ERROR: ctfmerge: Input file force-dynamic-hack.pico was partially built from C sources, but no CTF data was present
    Removing kernel.full
    
        kernel.full ---
        [kernel.full] Error code 1
    
    This partially reverts commit fdd3f6f78888b02a1bfa69a0572317413dc14a45.
    
    PR:             299013
    Reported by:    markj
    Reviewed by:    markj, emaste
    Fixes:          fdd3f6f78888 ("bsd.lib.mk: only ctfmerge if objfiles have a CTF section")
    Differential Revision:  https://reviews.freebsd.org/D60378
---
 share/mk/sys.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index f63223e8464e..bb943d2b1519 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -165,7 +165,7 @@ CPP		?=	cpp
 CTFFLAGS	?=	-L VERSION
 
 CTFCONVERT	?=	ctfconvert
-CTFMERGE	?=	ctfmerge -t
+CTFMERGE	?=	ctfmerge
 
 .if defined(CFLAGS) && (${CFLAGS:M-g} != "")
 CTFFLAGS	+=	-g