diff options
| -rw-r--r-- | share/mk/sys.mk | 5 | ||||
| -rw-r--r-- | tools/build/options/WITH_META_MODE | 5 | ||||
| -rwxr-xr-x | tools/build/options/makeman | 12 |
3 files changed, 17 insertions, 5 deletions
diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 2b86a7b056b4..26919a320cc1 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -29,6 +29,11 @@ __DEFAULT_DEPENDENT_OPTIONS= \ STAGING/META_MODE \ SYSROOT/META_MODE +__ENV_ONLY_OPTIONS:= \ + ${__DEFAULT_NO_OPTIONS} \ + ${__DEFAULT_YES_OPTIONS} \ + ${__DEFAULT_DEPENDENT_OPTIONS:H} + # early include for customization # see local.sys.mk below # Not included when building in fmake compatibility mode (still needed diff --git a/tools/build/options/WITH_META_MODE b/tools/build/options/WITH_META_MODE index 88402a464466..b255777956bc 100644 --- a/tools/build/options/WITH_META_MODE +++ b/tools/build/options/WITH_META_MODE @@ -25,11 +25,6 @@ If is available the meta file will also capture a record of files used to produce the target by tracking syscalls. .Pp -This must be set in the environment or -.Pa /etc/src-env.conf , -not -.Pa /etc/src.conf . -.Pp The build will hide commands ran unless .Va NO_SILENT is defined. diff --git a/tools/build/options/makeman b/tools/build/options/makeman index ef469e1751b5..3b5864f15609 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -221,6 +221,7 @@ EOF show with SRCCONF=/dev/null | sort | sed 's/$/=/' > $t/src.conf show settings SRCCONF=$t/src.conf | sort > $t/config_WITH_ALL show without SRCCONF=/dev/null | sort > $t/config_WITHOUT_ALL + env_only_options="$(${make} -V __ENV_ONLY_OPTIONS)" show_options | while read opt targets ; do @@ -289,6 +290,17 @@ EOF done echo '.El' fi + + case " ${env_only_options} " in + *\ ${opt#*_}\ *) + echo ".Pp" + echo "This must be set in the environment or" + echo ".Pa /etc/src-env.conf ," + echo "not" + echo ".Pa /etc/src.conf ." + ;; + esac + twiddle >&2 done cat <<EOF |