Module Name: src
Committed By: ozaki-r
Date: Mon Mar 10 02:04:29 UTC 2014
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Use CTFMFLAGS, not CTFFLAGS, for CTFMERGE
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 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.165 src/sys/conf/Makefile.kern.inc:1.166
--- src/sys/conf/Makefile.kern.inc:1.165 Tue Mar 4 14:58:14 2014
+++ src/sys/conf/Makefile.kern.inc Mon Mar 10 02:04:29 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.165 2014/03/04 14:58:14 joerg Exp $
+# $NetBSD: Makefile.kern.inc,v 1.166 2014/03/10 02:04:29 ozaki-r Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -226,7 +226,7 @@ SYSTEM_DEP+= Makefile ${SYSTEM_OBJ:O} .g
SYSTEM_DEP+= ${KERNLDSCRIPT}
.endif
.if defined(CTFMERGE)
-SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
+SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
.else
SYSTEM_CTFMERGE= ${_MKSHECHO}
.endif
