From 5fecb1f1d617fa2928700f7449eaf78d33fa265e Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Thu, 2 Nov 2017 23:00:04 +0000 Subject: [PATCH] AUTO_OBJ is unsafe at the moment as it is for some reason removing /etc with _cleanobj. --- Makefile | 1 - share/mk/src.sys.obj.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b2b51161fc9..305e1b948bb 100644 --- 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 index 7d32ea83601..75541a5ba92 100644 --- 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) && \