Module Name: src
Committed By: christos
Date: Wed Jan 4 21:37:46 UTC 2017
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Collect a list of kernel swap files to be removed (Yorick Hardy)
To generate a diff of this commit:
cvs rdiff -u -r1.252 -r1.253 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.252 src/sys/conf/Makefile.kern.inc:1.253
--- src/sys/conf/Makefile.kern.inc:1.252 Wed Jan 4 14:55:06 2017
+++ src/sys/conf/Makefile.kern.inc Wed Jan 4 16:37:46 2017
@@ -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 @@ SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS
.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
