svn commit: r325348 - in head: . share/mk

[Bryan Drewery]

Author: bdrewery
Date: Thu Nov  2 23:00:04 2017
New Revision: 325348
URL: https://svnweb.freebsd.org/changeset/base/325348

Log:
  AUTO_OBJ is unsafe at the moment as it is for some reason removing /etc with _cleanobj.

Modified:
  head/Makefile
  head/share/mk/src.sys.obj.mk

Modified: head/Makefile
==============================================================================
--- head/Makefile	Thu Nov  2 22:23:00 2017	(r325347)
+++ head/Makefile	Thu Nov  2 23:00:04 2017	(r325348)
@@ -1,4 +1,3 @@
-.error Bad revision, please wait for a fix in head
 #
 # $FreeBSD$
 #

Modified: head/share/mk/src.sys.obj.mk
==============================================================================
--- head/share/mk/src.sys.obj.mk	Thu Nov  2 22:23:00 2017	(r325347)
+++ head/share/mk/src.sys.obj.mk	Thu Nov  2 23:00:04 2017	(r325348)
@@ -97,7 +97,7 @@ OBJROOT:=	${OBJTOP}/
 # Try to enable MK_AUTO_OBJ by default if we can write to the OBJROOT.  Only
 # do this if AUTO_OBJ is not disabled by the user, not cleaning, and this
 # is the first make ran.
-.if ${.MAKE.LEVEL} == 0 && \
+.if 0 && ${.MAKE.LEVEL} == 0 && \
     ${MK_AUTO_OBJ} == "no" && empty(.MAKEOVERRIDES:MMK_AUTO_OBJ) && \
     !defined(WITHOUT_AUTO_OBJ) && !make(showconfig) && !make(print-dir) && \
     !defined(NO_OBJ) && \