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

META_MODE: Follow-up r287879 and have 'make -V .OBJDIR' still invoke auto.obj.mk.

Browse Source 
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
This commit is contained in:
bdrewery 2015-09-23 20:46:23 +00:00
parent 55f02506ea
commit 8e99ed192a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
share/mk/sys.mk
View File

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