[src/trunk]: src/sys/conf Revert rev 1.278 which tried to call ctfmerge only ...

[simonb <simonb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/887e31cd51e8
branches:  trunk
changeset: 961023:887e31cd51e8
user:      simonb <simonb%NetBSD.org@localhost>
date:      Tue Apr 06 15:05:12 2021 +0000

description:
Revert rev 1.278 which tried to call ctfmerge only once - this has
caused kernels with embedded symbol tables to explode in size.

diffstat:

 sys/conf/Makefile.kern.inc |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r 5bbcac59cd2d -r 887e31cd51e8 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Tue Apr 06 13:35:52 2021 +0000
+++ b/sys/conf/Makefile.kern.inc        Tue Apr 06 15:05:12 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.279 2021/04/05 22:52:03 christos Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.280 2021/04/06 15:05:12 simonb Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -210,6 +210,11 @@
 SYSTEM_LIB=    ${MD_LIBS} ${LIBKERN}
 SYSTEM_OBJ?=   ${_MD_OBJS} ${OBJS} ${SYSTEM_LIB}
 SYSTEM_DEP+=   Makefile ${SYSTEM_OBJ:O}
+.if defined(CTFMERGE)
+SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
+.else
+SYSTEM_CTFMERGE= ${_MKSHECHO}
+.endif
 
 REMOVE_SWAP=   [@]
 .for k in ${KERNELS}
@@ -237,7 +242,7 @@
 LINKFLAGS_DEBUG?=      -X
 
 SYSTEM_LD_TAIL?=@${TOOL_SED} '/const char sccs/!d;s/.*@(.)//;s/" "//;s/\\.*//' vers.c && \
-               ${SIZE} $@ && chmod 755 $@
+               ${SIZE} $@ && ${SYSTEM_CTFMERGE} && chmod 755 $@
 SYSTEM_LD_TAIL_DEBUG?=&& \
                echo mv -f $@ $@.gdb && mv -f $@ $@.gdb && \
                echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb && \
@@ -260,11 +265,6 @@
 SYSTEM_LD_HEAD+=       ${SYSTEM_LD_HEAD_EXTRA}
 SYSTEM_LD_TAIL_STAGE1= ${SYSTEM_LD_TAIL}
 SYSTEM_LD_TAIL_STAGE2= ${SYSTEM_LD_TAIL}
-.if defined(CTFMERGE)
-SYSTEM_LD_TAIL_STAGE2+= && echo ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ... \
-                       && ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} \
-                           ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
-.endif
 .if defined(COPY_SYMTAB)
 SYSTEM_LD_TAIL_STAGE2+=        && echo ${DBSYM} $@ && ${DBSYM} $@
 .if !empty(DEBUG:M-g)