Date: Tue, 7 Nov 2017 18:20:08 +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: r325520 - head/share/mk Message-ID: <201711071820.vA7IK835007755@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Nov 7 18:20:08 2017 New Revision: 325520 URL: https://svnweb.freebsd.org/changeset/base/325520 Log: Reenable AUTO_OBJ by default. The problem with it was a bogus .OBJDIR in some cases where creation of object directories were purposely not attempted, such as for 'make cleandir' and in etc/ sub-directories. In these cases bmake would start with a bogus .OBJDIR like etc/ due to MAKEOBJDIR being a dynamic value based on .CURDIR, SRCTOP, and OBJTOP. OBJTOP would not yet be defined but is during early src.sys.obj.mk. That file and auto.obj.mk both were not modifying .OBJDIR unless they expected to create the objdir. Thus in these cases the .OBJDIR was left as etc/* rather than fixed to the proper .CURDIR. The issues were fixed in r325404 and r325416. An assertion to avoid the bad .OBJDIR was added in r325405. Sponsored by: Dell EMC Isilon Modified: head/share/mk/src.sys.obj.mk Modified: head/share/mk/src.sys.obj.mk ============================================================================== --- head/share/mk/src.sys.obj.mk Tue Nov 7 17:45:39 2017 (r325519) +++ head/share/mk/src.sys.obj.mk Tue Nov 7 18:20:08 2017 (r325520) @@ -105,7 +105,7 @@ __objdir:= ${MAKEOBJDIR} # Try to enable MK_AUTO_OBJ by default if we can write to the __objdir. Only # do this if AUTO_OBJ is not disabled by the user, not cleaning, and this is # the first make ran. -.if 0 && ${.MAKE.LEVEL} == 0 && \ +.if ${.MAKE.LEVEL} == 0 && \ ${MK_AUTO_OBJ} == "no" && empty(.MAKEOVERRIDES:MMK_AUTO_OBJ) && \ !defined(WITHOUT_AUTO_OBJ) && !make(showconfig) && !make(print-dir) && \ !defined(NO_OBJ) && \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711071820.vA7IK835007755>