Date: Sat, 10 Mar 2018 02:13:48 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330725 - head/sys/conf Message-ID: <201803100213.w2A2Dm8K073929@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sat Mar 10 02:13:48 2018 New Revision: 330725 URL: https://svnweb.freebsd.org/changeset/base/330725 Log: Fix rebase mismerge in r330724. X-MFC-With: r330724 MFC after: 2 weeks Sponsored by: Dell EMC Modified: head/sys/conf/kern.post.mk Modified: head/sys/conf/kern.post.mk ============================================================================== --- head/sys/conf/kern.post.mk Sat Mar 10 02:10:26 2018 (r330724) +++ head/sys/conf/kern.post.mk Sat Mar 10 02:13:48 2018 (r330725) @@ -201,8 +201,8 @@ _meta_filemon= 1 # since it will track dependencies itself. OBJS_DEPEND_GUESS is still used # for _meta_filemon but not for _SKIP_DEPEND. .if !defined(NO_SKIP_DEPEND) && \ - (!empty(.MAKEFLAGS:M-V) && empty(.MAKEFLAGS:M*DEP*)) || \ - (${.TARGETS:M*obj} == ${.TARGETS} || \ + ((!empty(.MAKEFLAGS:M-V) && empty(.MAKEFLAGS:M*DEP*)) || \ + ${.TARGETS:M*obj} == ${.TARGETS} || \ ${.TARGETS:M*clean*} == ${.TARGETS} || \ ${.TARGETS:M*install*} == ${.TARGETS}) _SKIP_DEPEND= 1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803100213.w2A2Dm8K073929>