Index: share/mk/sys.mk
===================================================================
RCS file: /home/joerg/repo/netbsd/src/share/mk/sys.mk,v
retrieving revision 1.129
diff -u -p -r1.129 sys.mk
--- share/mk/sys.mk	30 Mar 2016 17:35:43 -0000	1.129
+++ share/mk/sys.mk	24 Nov 2016 12:55:49 -0000
@@ -39,8 +39,8 @@ DBG?=	-O2
 .endif
 CFLAGS?=	${DBG}
 LDFLAGS?=
-COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
-LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
+COMPILE.c?=	${CC} -MJ ${.TARGET}.json ${CFLAGS} ${CPPFLAGS} -c
+LINK.c?=	${CC} -MJ ${.TARGET}.json ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 # C Type Format data is required for DTrace
 CTFFLAGS	?=	-g -L VERSION
@@ -55,13 +55,13 @@ __ALLSRC3=	${empty(NETBSDSRCDIR):?${__AL
 __BUILDSEED=	${BUILDSEED}/${__ALLSRC3:O}/${.TARGET}
 _CXXSEED?=	${BUILDSEED:D-frandom-seed=${__BUILDSEED:hash}}
 
-COMPILE.cc?=	${CXX} ${_CXXSEED} ${CXXFLAGS} ${CPPFLAGS} -c
-LINK.cc?=	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}
+COMPILE.cc?=	${CXX} -MJ ${.TARGET}.json ${_CXXSEED} ${CXXFLAGS} ${CPPFLAGS} -c
+LINK.cc?=	${CXX} -MJ ${.TARGET}.json ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 OBJC?=		${CC}
 OBJCFLAGS?=	${CFLAGS}
-COMPILE.m?=	${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c
-LINK.m?=	${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS}
+COMPILE.m?=	${OBJC} -MJ ${.TARGET}.json ${OBJCFLAGS} ${CPPFLAGS} -c
+LINK.m?=	${OBJC} -MJ ${.TARGET}.json ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CPP?=		cpp
 CPPFLAGS?=
Index: sys/conf/Makefile.kern.inc
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/conf/Makefile.kern.inc,v
retrieving revision 1.250
diff -u -p -r1.250 Makefile.kern.inc
--- sys/conf/Makefile.kern.inc	9 Apr 2016 18:51:44 -0000	1.250
+++ sys/conf/Makefile.kern.inc	24 Nov 2016 20:14:25 -0000
@@ -127,7 +128,7 @@ COMPILE_CTFCONVERT=	${_MKSHECHO}\
 COMPILE_CTFCONVERT=	${_MKSHNOECHO}
 .endif
 
-KCOMPILE.c=	${CC} ${COPTS.${<:T}} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
+KCOMPILE.c=	${CC} -MJ ${.TARGET}.json ${COPTS.${<:T}} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
 KCOMPILE.s=	${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${CPPFLAGS} -c $< -o $@
 KLINK.o=	${LD} -r ${LINKFORMAT} -Map=${.TARGET}.map -o ${.TARGET} ${.ALLSRC}