Date: Wed, 25 Nov 2015 19:13:32 +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: r291312 - head/share/mk Message-ID: <201511251913.tAPJDWMk094703@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Nov 25 19:13:32 2015 New Revision: 291312 URL: https://svnweb.freebsd.org/changeset/base/291312 Log: META MODE: Revert r287879 so that 'make -V' still uses AUTO_OBJ. This has caused much confusion for myself as there are quite a lot of variables that depend on having a proper ${.OBJDIR}. Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Wed Nov 25 19:13:28 2015 (r291311) +++ head/share/mk/sys.mk Wed Nov 25 19:13:32 2015 (r291312) @@ -51,11 +51,9 @@ __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' (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) +# Don't do this for 'make showconfig' as it enables all options where meta mode +# is not expected. +.if !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?201511251913.tAPJDWMk094703>