[src/trunk]: src/sys/conf Collect a list of kernel swap files to be removed (...

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

details:   https://anonhg.NetBSD.org/src/rev/31ad45487519
branches:  trunk
changeset: 820254:31ad45487519
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jan 04 21:37:46 2017 +0000

description:
Collect a list of kernel swap files to be removed (Yorick Hardy)

diffstat:

 sys/conf/Makefile.kern.inc |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 8d8ccb97f5a7 -r 31ad45487519 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Wed Jan 04 21:25:41 2017 +0000
+++ b/sys/conf/Makefile.kern.inc        Wed Jan 04 21:37:46 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.252 2017/01/04 19:55:06 christos Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.253 2017/01/04 21:37:46 christos Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -209,14 +209,20 @@
 .else
 SYSTEM_CTFMERGE= ${_MKSHECHO}
 .endif
+
+REMOVE_SWAP=   [@]
+.for k in ${KERNELS}
+REMOVE_SWAP:=  ${REMOVE_SWAP}:Nswap${k}.o
+.endfor
+
 SYSTEM_LD_HEAD?=@rm -f $@
 SYSTEM_LD?=    ${_MKSHMSG} "   link  ${.CURDIR:T}/${.TARGET}"; \
                ${_MKSHECHO}\
                ${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
-               '$${SYSTEM_OBJ:N*swap${.TARGET}.o}' '$${EXTRA_OBJ}' vers.o \
+               '$${SYSTEM_OBJ:${REMOVE_SWAP}}' '$${EXTRA_OBJ}' vers.o \
                ${OBJS:M*swap${.TARGET}.o}; \
                ${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
-               ${SYSTEM_OBJ:N*swap${.TARGET}.o} ${EXTRA_OBJ} vers.o \
+               ${SYSTEM_OBJ:${REMOVE_SWAP}} ${EXTRA_OBJ} vers.o \
                ${OBJS:M*swap${.TARGET}.o}
 
 TEXTADDR?=     ${LOADADDRESS}                  # backwards compatibility