Module Name: src
Committed By: uebayasi
Date: Sat Nov 15 08:20:42 UTC 2014
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Don't sort objects for modular build.
To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 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.181 src/sys/conf/Makefile.kern.inc:1.182
--- src/sys/conf/Makefile.kern.inc:1.181 Sat Nov 15 08:20:01 2014
+++ src/sys/conf/Makefile.kern.inc Sat Nov 15 08:20:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.181 2014/11/15 08:20:01 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.182 2014/11/15 08:20:42 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -223,7 +223,11 @@ ${_cfile:T:R}.o: ${_cfile}
# load lines for config "xxx" will be emitted as:
# xxx: ${SYSTEM_DEP} swapxxxx.o vers.o build_kernel
+.if !empty(OBJS:Mnetbsd.ko)
+SYSTEM_OBJ?= ${MD_OBJS} ${MI_OBJS} ${OBJS} ${SYSLIBCOMPAT} ${LIBKERN}
+.else
SYSTEM_OBJ?= ${MD_OBJS} ${MI_OBJS} ${OBJS:O} ${SYSLIBCOMPAT} ${LIBKERN}
+.endif
SYSTEM_DEP+= Makefile ${SYSTEM_OBJ:O} .gdbinit
.if defined(KERNLDSCRIPT)
SYSTEM_DEP+= ${KERNLDSCRIPT}
