d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rebase mismerge in r330724.

Browse Source 
X-MFC-With:	r330724
MFC after:	2 weeks
Sponsored by:	Dell EMC
This commit is contained in:
Bryan Drewery 2018-03-10 02:13:48 +00:00
parent 906ce865c2
commit 71b126549d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/conf/kern.post.mk
View File

@ -201,8 +201,8 @@ _meta_filemon= 1
# since it will track dependencies itself. OBJS_DEPEND_GUESS is still used # since it will track dependencies itself. OBJS_DEPEND_GUESS is still used
# for _meta_filemon but not for _SKIP_DEPEND. # for _meta_filemon but not for _SKIP_DEPEND.
.if !defined(NO_SKIP_DEPEND) && \ .if !defined(NO_SKIP_DEPEND) && \
(!empty(.MAKEFLAGS:M-V) && empty(.MAKEFLAGS:M*DEP*)) || \ ((!empty(.MAKEFLAGS:M-V) && empty(.MAKEFLAGS:M*DEP*)) || \
(${.TARGETS:M*obj} == ${.TARGETS} || \ ${.TARGETS:M*obj} == ${.TARGETS} || \
${.TARGETS:M*clean*} == ${.TARGETS} || \ ${.TARGETS:M*clean*} == ${.TARGETS} || \
${.TARGETS:M*install*} == ${.TARGETS}) ${.TARGETS:M*install*} == ${.TARGETS})
_SKIP_DEPEND= 1 _SKIP_DEPEND= 1