More build ordering.

This commit is contained in:
uebayasi 2015-09-06 15:20:59 +00:00
parent 9e0fc0ebb7
commit c009404037
2 changed files with 5 additions and 5 deletions

View File

@ -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 # This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}. # 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_LIB= ${MD_LIBS} ${SYSLIBCOMPAT} ${LIBKERN}
SYSTEM_OBJ?= ${_MD_OBJS} ${OBJS} ${SYSTEM_LIB} SYSTEM_OBJ?= ${_MD_OBJS} ${OBJS} ${SYSTEM_LIB}
SYSTEM_DEP+= Makefile ${SYSTEM_OBJ} SYSTEM_DEP+= Makefile ${SYSTEM_OBJ:O}
.if defined(CTFMERGE) .if defined(CTFMERGE)
SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
.else .else
@ -381,7 +381,7 @@ ${_s:T:R}.d: ${_s}
.endfor .endfor
.endif # !___USE_SUFFIX_RULES___ .endif # !___USE_SUFFIX_RULES___
.depend: ${DEPS} .depend: ${DEPS:O}
${_MKTARGET_CREATE} ${_MKTARGET_CREATE}
echo "${.ALLSRC}" | ${MKDEP} -D echo "${.ALLSRC}" | ${MKDEP} -D
.endif .endif

View File

@ -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} # Give MD generated ldscript dependency on ${SYSTEM_OBJ}
.if defined(KERNLDSCRIPT) .if defined(KERNLDSCRIPT)
.if target(${KERNLDSCRIPT}) .if target(${KERNLDSCRIPT})
${KERNLDSCRIPT}: ${SYSTEM_OBJ} ${KERNLDSCRIPT}: ${SYSTEM_OBJ:O}
.endif .endif
.endif .endif