Date: Fri, 3 Nov 2017 01:09:35 +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: r325351 - head/share/mk Message-ID: <201711030109.vA319Zf8053763@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Nov 3 01:09:35 2017 New Revision: 325351 URL: https://svnweb.freebsd.org/changeset/base/325351 Log: AUTO_OBJ: If the wanted .OBJDIR was not used then disable the feature. 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 Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Fri Nov 3 00:29:42 2017 (r325350) +++ head/share/mk/sys.mk Fri Nov 3 01:09:35 2017 (r325351) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711030109.vA319Zf8053763>