diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-11-25 19:13:32 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-11-25 19:13:32 +0000 |
| commit | d1050e87e395ec2c7c844c9a0089d522dd1a0d2e (patch) | |
| tree | 7f349f0eab441a1abca342f662ad633a9be063e6 | |
| parent | a23213fe40d3ad7b3f5a587934b80cf19a91c4e8 (diff) | |
| download | FreeBSD-src-d1050e87e395ec2c7c844c9a0089d522dd1a0d2e.zip FreeBSD-src-d1050e87e395ec2c7c844c9a0089d522dd1a0d2e.tar.gz | |
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
| -rw-r--r-- | share/mk/sys.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 6b6f847..ff753f4 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -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 |
