AUTO_OBJ is unsafe at the moment as it is for some reason removing /e…

…tc with _cleanobj.
nhuff · Nov 2, 2017 · 5fecb1f · 5fecb1f
1 parent aee3a96
commit 5fecb1f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,3 @@
-.error Bad revision, please wait for a fix in head
 #
 # $FreeBSD$
 #

diff --git a/share/mk/src.sys.obj.mk b/share/mk/src.sys.obj.mk
@@ -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) && \