Date: Sat, 4 Nov 2017 21:06:39 +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: r325406 - head/share/mk Message-ID: <201711042106.vA4L6dZi065294@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sat Nov 4 21:06:39 2017 New Revision: 325406 URL: https://svnweb.freebsd.org/changeset/base/325406 Log: AUTO_OBJ: Revert r325351 now that the fix is in auto.obj.mk in r325404. Forcing MK_AUTO_OBJ to no is not really needed since bsd.obj.mk is protected against 'rm -rf ${.CURDIR}' already. It was also flawed as if MK_AUTO_OBJ=yes was in the .MAKEOVERRIDES already then it just remained on. Sponsored by: Dell EMC Isilon Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Sat Nov 4 21:05:03 2017 (r325405) +++ head/share/mk/sys.mk Sat Nov 4 21:06:39 2017 (r325406) @@ -120,12 +120,6 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711042106.vA4L6dZi065294>