aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2017-11-02 23:00:04 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2017-11-02 23:00:04 +0000
commit5fecb1f1d617fa2928700f7449eaf78d33fa265e (patch)
treef5b9425205c555587fde5f550be0db99969be143
parentaee3a96ebeb255b04b6a1230eeb0adeeca9486f7 (diff)
downloadsrc-5fecb1f1d617fa2928700f7449eaf78d33fa265e.tar.gz
src-5fecb1f1d617fa2928700f7449eaf78d33fa265e.zip
AUTO_OBJ is unsafe at the moment as it is for some reason removing /etc with _cleanobj.
Notes
Notes: svn path=/head/; revision=325348
-rw-r--r--Makefile1
-rw-r--r--share/mk/src.sys.obj.mk2
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b2b51161fc9c..305e1b948bb5 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 7d32ea836012..75541a5ba922 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) && \