Page MenuHomeFreeBSD

D60252.diff
No OneTemporary

D60252.diff

diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -291,7 +291,7 @@
.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
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -165,7 +165,7 @@
CTFFLAGS ?= -L VERSION
CTFCONVERT ?= ctfconvert
-CTFMERGE ?= ctfmerge
+CTFMERGE ?= ctfmerge -t
.if defined(CFLAGS) && (${CFLAGS:M-g} != "")
CTFFLAGS += -g

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 4, 12:46 AM (22 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40164485
Default Alt Text
D60252.diff (675 B)

Event Timeline