Date: Wed, 23 Sep 2015 20:46:24 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r288152 - head/share/mk Message-ID: <201509232046.t8NKkOSP029626@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Sep 23 20:46:23 2015 New Revision: 288152 URL: https://svnweb.freebsd.org/changeset/base/288152 Log: 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 Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Wed Sep 23 19:30:46 2015 (r288151) +++ head/share/mk/sys.mk Wed Sep 23 20:46:23 2015 (r288152) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509232046.t8NKkOSP029626>