Module Name: src
Committed By: uebayasi
Date: Sun Sep 6 15:20:59 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc ldscript.mk
Log Message:
More build ordering.
To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.1 -r1.2 src/sys/conf/ldscript.mk
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.242 src/sys/conf/Makefile.kern.inc:1.243
--- src/sys/conf/Makefile.kern.inc:1.242 Sun Sep 6 14:35:01 2015
+++ src/sys/conf/Makefile.kern.inc Sun Sep 6 15:20:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.242 2015/09/06 14:35:01 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.243 2015/09/06 15:20:59 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -203,7 +203,7 @@ _MD_OBJS= ${MD_OBJS}
SYSTEM_LIB= ${MD_LIBS} ${SYSLIBCOMPAT} ${LIBKERN}
SYSTEM_OBJ?= ${_MD_OBJS} ${OBJS} ${SYSTEM_LIB}
-SYSTEM_DEP+= Makefile ${SYSTEM_OBJ}
+SYSTEM_DEP+= Makefile ${SYSTEM_OBJ:O}
.if defined(CTFMERGE)
SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
.else
@@ -381,7 +381,7 @@ ${_s:T:R}.d: ${_s}
.endfor
.endif # !___USE_SUFFIX_RULES___
-.depend: ${DEPS}
+.depend: ${DEPS:O}
${_MKTARGET_CREATE}
echo "${.ALLSRC}" | ${MKDEP} -D
.endif
Index: src/sys/conf/ldscript.mk
diff -u src/sys/conf/ldscript.mk:1.1 src/sys/conf/ldscript.mk:1.2
--- src/sys/conf/ldscript.mk:1.1 Sun Sep 6 06:41:14 2015
+++ src/sys/conf/ldscript.mk Sun Sep 6 15:20:59 2015
@@ -1,9 +1,9 @@
-# $NetBSD: ldscript.mk,v 1.1 2015/09/06 06:41:14 uebayasi Exp $
+# $NetBSD: ldscript.mk,v 1.2 2015/09/06 15:20:59 uebayasi Exp $
# Give MD generated ldscript dependency on ${SYSTEM_OBJ}
.if defined(KERNLDSCRIPT)
.if target(${KERNLDSCRIPT})
-${KERNLDSCRIPT}: ${SYSTEM_OBJ}
+${KERNLDSCRIPT}: ${SYSTEM_OBJ:O}
.endif
.endif
