aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiva Mahadevan <siva@FreeBSD.org>2026-10-02 19:54:55 +0000
committerSiva Mahadevan <siva@FreeBSD.org>2026-10-05 14:07:44 +0000
commitfdd3f6f78888b02a1bfa69a0572317413dc14a45 (patch)
tree71e1014259ae9aff505f54492548913b9f852d4a
parent68386f6b551e64c956c9623b9973be9e462ce1de (diff)
bsd.lib.mk: only ctfmerge if objfiles have a CTF section
PR: 299013 Reported by: Trond.Endrestol@ximalas.info Reviewed by: emaste Fixes: 222210c6a822 ("libgcc_s: add libgcc_s_asneeded.so wrapper for gcc 16") MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D60252
-rw-r--r--share/mk/bsd.lib.mk2
-rw-r--r--share/mk/sys.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index e3b3d760ff28..5b7bed041b8f 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -291,7 +291,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
.endif
${_LD:N${CCACHE_BIN}} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
-o ${.TARGET} -Wl,-soname,${SONAME} ${SOBJS} ${LDADD}
-.if ${MK_CTF} != "no"
+.if ${MK_CTF} != "no" && defined(SOBJS) && !empty(SOBJS)
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
.endif
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index bb943d2b1519..f63223e8464e 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -165,7 +165,7 @@ CPP ?= cpp
CTFFLAGS ?= -L VERSION
CTFCONVERT ?= ctfconvert
-CTFMERGE ?= ctfmerge
+CTFMERGE ?= ctfmerge -t
.if defined(CFLAGS) && (${CFLAGS:M-g} != "")
CTFFLAGS += -g