Introduce the KEEPKERNELS variable: if this is set either in mk.conf or

the environment, 'make cleandir' does not descend into kernel build
directories.  Thus, kernel object files survive 'make build' on slower
architectures.

WARNING:
If you set this variable, you run the risk of breaking 'make release':
Be sure to run 'make cleandir' from /sys/arch/$(machine)/compile before
doing 'make release'.  This issue will be addressed shortly.

requested by kettenis;
ok deraadt

1 files changed, 6 insertions, 2 deletions

diff --git a/sys/arch/octeon/Makefile b/sys/arch/octeon/Makefile
index cda6b5d3709..c6964fd88cf 100644
--- a/sys/arch/octeon/Makefile
+++ b/sys/arch/octeon/Makefile
@@ -1,4 +1,6 @@
-#	$OpenBSD: Makefile,v 1.7 2016/10/14 18:42:58 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 2017/01/22 03:27:31 tb Exp $
+
+.include <bsd.own.mk>    # for KEEPKERNELS
 
 S=	${.CURDIR}/../..
 KFILE=	GENERIC
@@ -11,7 +13,9 @@ TAGS=	${.CURDIR}/tags
 NOPROG=
 NOMAN=
 NOOBJ=
-SUBDIR=	compile
+.if !defined(KEEPKERNELS) || !(make(clean) || make(cleandir))
+SUBDIR+=compile
+.endif
 
 # config the fattest kernel we can find into a temporary dir
 # to create a Makefile.  Then use make to pull some variables