aboutsummaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2017-05-09 20:21:38 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2017-05-09 20:21:38 +0000
commit6d75a7a852fe046e3866858ff995447498904e95 (patch)
tree2de2b48df47a89f71f0060708b509a62d4f384a2 /sys/conf
parente9b7132b30b52817896360c59523c38464c4643f (diff)
Support skipping 'make obj' tree-walk.
This is part of a larger effort for WITH_AUTO_OBJ and a WORLDFAST option. Sponsored by: Dell EMC Isilon
Notes
svn path=/head/; revision=318105
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/kern.post.mk2
-rw-r--r--sys/conf/kern.pre.mk8
2 files changed, 9 insertions, 1 deletions
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index aa6cc60202ec..6d0587ba12e5 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -35,7 +35,7 @@ KERN_DEBUGDIR?= ${DEBUGDIR}
.MAIN: all
.for target in all clean cleandepend cleandir clobber depend install \
- obj reinstall tags
+ ${_obj} reinstall tags
${target}: kernel-${target}
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
${target}: modules-${target}
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 95118dee0794..a443de7b71b8 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -24,6 +24,14 @@ _srcconf_included_:
.MAKE.MODE+= curdirOk=yes
.endif
+.if defined(NO_OBJ) || ${MK_AUTO_OBJ} == "yes"
+NO_OBJ= t
+NO_MODULES_OBJ= t
+.endif
+.if !defined(NO_OBJ)
+_obj= obj
+.endif
+
# Can be overridden by makeoptions or /etc/make.conf
KERNEL_KO?= kernel
KERNEL?= kernel