Date: Wed, 8 Aug 2018 18:48:40 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r337480 - stable/11/sys/conf Message-ID: <201808081848.w78Imef1039528@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Aug 8 18:48:40 2018 New Revision: 337480 URL: https://svnweb.freebsd.org/changeset/base/337480 Log: MFC r335922: Use OBJS_DEPEND_GUESS for forced opt_global.h dependency. Modified: stable/11/sys/conf/kern.post.mk stable/11/sys/conf/kmod.mk Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/conf/kern.post.mk ============================================================================== --- stable/11/sys/conf/kern.post.mk Wed Aug 8 18:46:03 2018 (r337479) +++ stable/11/sys/conf/kern.post.mk Wed Aug 8 18:48:40 2018 (r337480) @@ -196,7 +196,8 @@ assym.s: $S/kern/genassym.sh genassym.o genassym.o: $S/$M/$M/genassym.c ${CC} -c ${CFLAGS:N-flto:N-fno-common} $S/$M/$M/genassym.c -${SYSTEM_OBJS} genassym.o vers.o: opt_global.h +OBJS_DEPEND_GUESS+= opt_global.h +genassym.o vers.o: opt_global.h .if !empty(.MAKE.MODE:Unormal:Mmeta) && empty(.MAKE.MODE:Unormal:Mnofilemon) _meta_filemon= 1 Modified: stable/11/sys/conf/kmod.mk ============================================================================== --- stable/11/sys/conf/kmod.mk Wed Aug 8 18:46:03 2018 (r337479) +++ stable/11/sys/conf/kmod.mk Wed Aug 8 18:48:40 2018 (r337480) @@ -449,9 +449,6 @@ acpi_quirks.h: ${SYSDIR}/tools/acpi_quirks2h.awk ${SYS CLEANFILES+= assym.s genassym.o DEPENDOBJS+= genassym.o assym.s: genassym.o -.if defined(KERNBUILDDIR) -genassym.o: opt_global.h -.endif assym.s: ${SYSDIR}/kern/genassym.sh sh ${SYSDIR}/kern/genassym.sh genassym.o > ${.TARGET} genassym.o: ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c @@ -463,16 +460,15 @@ genassym.o: ${SRCS:Mopt_*.h} lint: ${SRCS} ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC:M*.c} -.if defined(KERNBUILDDIR) -${OBJS}: opt_global.h -.endif - CLEANDEPENDFILES+= ${_ILINKS} # .depend needs include links so we remove them only together. cleanilinks: rm -f ${_ILINKS} OBJS_DEPEND_GUESS+= ${SRCS:M*.h} +.if defined(KERNBUILDDIR) +OBJS_DEPEND_GUESS+= opt_global.h +.endif .include <bsd.dep.mk> .include <bsd.clang-analyze.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808081848.w78Imef1039528>