diff options
| author | gjb <gjb@FreeBSD.org> | 2016-04-12 17:00:13 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-04-12 17:00:13 +0000 |
| commit | 2d6ac6ea572ca93a1ff4e32936214246cc9b2551 (patch) | |
| tree | c3cdd1c8ee2d4ab6be944ececea30f9adb0abca4 /share | |
| parent | b1a356c5589c598d7abc2975bd356c87dcaba309 (diff) | |
| download | FreeBSD-src-2d6ac6ea572ca93a1ff4e32936214246cc9b2551.zip FreeBSD-src-2d6ac6ea572ca93a1ff4e32936214246cc9b2551.tar.gz | |
MFH
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man5/src.conf.5 | 21 | ||||
| -rw-r--r-- | share/mk/local.sys.mk | 3 |
2 files changed, 18 insertions, 6 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 68e1621..e638803 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 292283 2015-12-15 18:42:30Z bdrewery .\" $FreeBSD$ -.Dd March 30, 2016 +.Dd April 11, 2016 .Dt SRC.CONF 5 .Os .Sh NAME @@ -473,7 +473,7 @@ executable binary and shared library. .\" from FreeBSD: head/tools/build/options/WITHOUT_DICT 156932 2006-03-21 07:50:50Z ru Set to not build the Webster dictionary files. .It Va WITH_DIRDEPS_BUILD -.\" from FreeBSD: head/tools/build/options/WITH_DIRDEPS_BUILD 290816 2015-11-14 03:24:48Z sjg +.\" from FreeBSD: head/tools/build/options/WITH_DIRDEPS_BUILD 297843 2016-04-12 03:37:42Z bdrewery Enable building in meta mode. This is an experimental build feature. For details see @@ -494,7 +494,9 @@ computing a graph of tree dependencies from the current origin. Setting .Va NO_DIRDEPS will skip checking dirdep dependencies and will only build in the current -directory. +and child directories. +.Va NO_DIRDEPS_BELOW +will skip building any dirdeps and only build the current directory. .Pp As each target is made .Xr make 1 @@ -1057,9 +1059,18 @@ Set to not build utilities for manual pages, .Xr manctl 8 , and related support files. .It Va WITH_META_MODE -.\" from FreeBSD: head/tools/build/options/WITH_META_MODE 290816 2015-11-14 03:24:48Z sjg +.\" from FreeBSD: head/tools/build/options/WITH_META_MODE 297844 2016-04-12 03:40:13Z bdrewery Create meta files when not doing DIRDEPS_BUILD. -The meta files can be useful for debugging. +When the +.Xr filemon 4 +module is loaded, dependencies will be tracked for all commands. +If any command, its dependencies, or files it generates are missing then +the target will be considered out-of-date and rebuilt. +The meta files can also be useful for debugging. +.Pp +The build will hide commands ran unless +.Va NO_SILENT +is defined. .Pp This must be set in the environment, make command line, or .Pa /etc/src-env.conf , diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index ced441f..f6a9824 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -33,7 +33,8 @@ OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP} # we can afford to use cookies to prevent some targets # re-running needlessly but only when using filemon. .if ${.MAKE.MODE:Mnofilemon} == "" -META_COOKIE= ${COOKIE.${.TARGET}:U${.OBJDIR}/${.TARGET}} +META_COOKIE_COND= empty(.TARGET:M${.OBJDIR}) +META_COOKIE= ${COOKIE.${.TARGET}:U${${META_COOKIE_COND}:?${.OBJDIR}/${.TARGET}:${.TARGET}}} META_COOKIE_RM= @rm -f ${META_COOKIE} META_COOKIE_TOUCH= @touch ${META_COOKIE} CLEANFILES+= ${META_TARGETS} |
