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

AUTO_OBJ: If the wanted .OBJDIR was not used then disable the feature.

Browse Source 
This is to prevent downstream checks from assuming they can trust .OBJDIR when
MK_AUTO_OBJ is yes, such as the bsd.obj.mk checks.

Pointyhat to:	bdrewery
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-11-03 01:09:35 +00:00
parent 2c36cefeaf
commit 40a54c51c9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/mk/sys.mk
View File

@ -120,8 +120,14 @@ NO_META_IGNORE_HOST_HEADERS= 1
# is not expected.
.if !make(showconfig) && !make(print-dir)
.sinclude <auto.obj.mk>
# The .OBJDIR was not set, disable MK_AUTO_OBJ so downstream checks won't
# assume .OBJDIR is proper.
.if defined(__objdir) && ${.OBJDIR} != ${__objdir}
.MAKEOVERRIDES+= MK_AUTO_OBJ
MK_AUTO_OBJ= no
.endif
.endif
.endif # ${MK_AUTO_OBJ} == "yes"
.else # bmake
.include <bsd.mkopt.mk>
.endif