diff options
author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-09-17 20:33:52 +0000 |
---|---|---|
committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-09-17 20:33:52 +0000 |
commit | da6e996de3ecd16e1d0e2e11edb2077c3f4aca7c (patch) | |
tree | 01b51521bdea244e8e4643da85fd0b8151477366 /tools | |
parent | 37bde76922c53a80383a1c7a35f363b304f9562b (diff) | |
download | src-da6e996de3ecd16e1d0e2e11edb2077c3f4aca7c.tar.gz src-da6e996de3ecd16e1d0e2e11edb2077c3f4aca7c.zip |
src.conf.5: Make it self-documenting that the mkopts are environment-only.
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=287932
Diffstat (limited to 'tools')
-rw-r--r-- | tools/build/options/WITH_META_MODE | 5 | ||||
-rwxr-xr-x | tools/build/options/makeman | 12 |
2 files changed, 12 insertions, 5 deletions
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 |