diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-09-23 20:46:23 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-09-23 20:46:23 +0000 |
| commit | 8e99ed192a65bf667e183b27b80a4a88ed3ce3c8 (patch) | |
| tree | 066c71990b45ef696205f80e6da83db134026598 | |
| parent | 55f02506ea7eb19ec7021451ec2472775ff084e8 (diff) | |
| download | FreeBSD-src-8e99ed192a65bf667e183b27b80a4a88ed3ce3c8.zip FreeBSD-src-8e99ed192a65bf667e183b27b80a4a88ed3ce3c8.tar.gz | |
META_MODE: Follow-up r287879 and have 'make -V .OBJDIR' still invoke auto.obj.mk.
When inspecting this value it is more expected to have it show the
automatically-created directory value rather than CURDIR.
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | share/mk/sys.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 26919a3..041a1f8 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -52,8 +52,11 @@ __ENV_ONLY_OPTIONS:= \ .endif .if ${MK_AUTO_OBJ} == "yes" # This needs to be done early - before .PATH is computed -# Don't do this if just running 'make -V' or 'make showconfig' -.if ${.MAKEFLAGS:M-V} == "" && !make(showconfig) +# Don't do this if just running 'make -V' (but do when inspecting .OBJDIR) or +# 'make showconfig' (during makeman which enables all options when meta mode +# is not expected) +.if (${.MAKEFLAGS:M-V} == "" || ${.MAKEFLAGS:M.OBJDIR} != "") && \ + !make(showconfig) .sinclude <auto.obj.mk> .endif .endif |
