Module Name: src
Committed By: christos
Date: Wed Jan 4 15:43:04 UTC 2017
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
PR/51772: Yorick Hardy: Don't hard-code "netbsd", use ${.TARGET} consistently.
To generate a diff of this commit:
cvs rdiff -u -r1.250 -r1.251 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.250 src/sys/conf/Makefile.kern.inc:1.251
--- src/sys/conf/Makefile.kern.inc:1.250 Sat Apr 9 14:51:44 2016
+++ src/sys/conf/Makefile.kern.inc Wed Jan 4 10:43:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.250 2016/04/09 18:51:44 riastradh Exp $
+# $NetBSD: Makefile.kern.inc,v 1.251 2017/01/04 15:43:04 christos Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -213,10 +213,10 @@ 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*netbsd*}' '$${EXTRA_OBJ}' vers.o \
+ '$${SYSTEM_OBJ:N*swap*${.TARGET}*}' '$${EXTRA_OBJ}' vers.o \
${OBJS:M*swap${.TARGET}.o}; \
${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
- ${SYSTEM_OBJ:N*swap*netbsd*} ${EXTRA_OBJ} vers.o \
+ ${SYSTEM_OBJ:N*swap*${.TARGET}*} ${EXTRA_OBJ} vers.o \
${OBJS:M*swap${.TARGET}.o}
TEXTADDR?= ${LOADADDRESS} # backwards compatibility