d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

META MODE: Revert r287879 so that 'make -V' still uses AUTO_OBJ.

Browse Source 
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
This commit is contained in:
Bryan Drewery 2015-11-25 19:13:32 +00:00
parent 393608176b
commit bb8cd0c6f0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=291312
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
share/mk/sys.mk
View File

@ -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