Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/conf Stop ordering objects alphabetically now that I am ...



details:   https://anonhg.NetBSD.org/src/rev/34df80f7a697
branches:  trunk
changeset: 340389:34df80f7a697
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Sep 03 01:30:18 2015 +0000

description:
Stop ordering objects alphabetically now that I am sure I can fix fallouts.

diffstat:

 sys/conf/Makefile.kern.inc |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (21 lines):

diff -r 49aad0ef77da -r 34df80f7a697 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Thu Sep 03 01:09:38 2015 +0000
+++ b/sys/conf/Makefile.kern.inc        Thu Sep 03 01:30:18 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.226 2015/09/03 01:09:38 uebayasi Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.227 2015/09/03 01:30:18 uebayasi Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -212,11 +212,7 @@
 # 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_OBJ_NOSWAP=     ${SYSTEM_OBJ:N*swap*netbsd*}
 SYSTEM_DEP+=   Makefile ${SYSTEM_OBJ} .gdbinit
 .if defined(CTFMERGE)



Home | Main Index | Thread Index | Old Index