Author: bdrewery
Date: Fri Jun 15 15:10:21 2018
New Revision: 335204
URL: https://svnweb.freebsd.org/changeset/base/335204
Log:
MFC r325560:
META_MODE: Bmake 20171028 in r325340 simplifies the meta filename.
Modified:
stable/11/share/mk/bsd.dep.mk
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/mk/bsd.dep.mk
==============================================================================
--- stable/11/share/mk/bsd.dep.mk Fri Jun 15 15:05:00 2018
(r335203)
+++ stable/11/share/mk/bsd.dep.mk Fri Jun 15 15:10:21 2018
(r335204)
@@ -226,10 +226,14 @@ afterdepend: beforedepend
# mimicing what bmake's meta_name() does and adding in the full path
# as well to ensure that the expected meta file is read.
.if ${__obj:M*/*}
+.if ${MAKE_VERSION} < 20171028
_meta_obj= ${.OBJDIR:C,/,_,g}_${__obj:C,/,_,g}.meta
.else
+_meta_obj= ${__obj:C,/,_,g}.meta
+.endif # ${MAKE_VERSION} < 20171028
+.else
_meta_obj= ${__obj}.meta
-.endif
+.endif # ${__obj:M*/*}
_dep_obj= ${DEPENDFILE}.${__obj:${DEPEND_FILTER}}
.if (defined(_meta_filemon) && !exists(${.OBJDIR}/${_meta_obj})) || \
(!defined(_meta_filemon) && !exists(${.OBJDIR}/${_dep_obj}))
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
