diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-03-12 22:21:02 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-03-12 22:21:02 +0000 |
| commit | 6079e1fc86aa6547c3ac7d3fa6f7b428fcad771e (patch) | |
| tree | cbcee6833ac5644120e0bc320772c72cdd60e88e /sys/conf | |
| parent | b1bc033d67e232dcd98d66a976a14c3325cb2c4a (diff) | |
| download | FreeBSD-src-6079e1fc86aa6547c3ac7d3fa6f7b428fcad771e.zip FreeBSD-src-6079e1fc86aa6547c3ac7d3fa6f7b428fcad771e.tar.gz | |
Stop looking up these values in every subdir on install.
This was slowing down installkernel since it was rerunning this in
every module directory.
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/config.mk | 3 | ||||
| -rw-r--r-- | sys/conf/kern.opts.mk | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sys/conf/config.mk b/sys/conf/config.mk index b95b781..35df003 100644 --- a/sys/conf/config.mk +++ b/sys/conf/config.mk @@ -49,6 +49,7 @@ KERN_OPTS+= INET6 .if ${MK_EISA} != "no" KERN_OPTS+= DEV_EISA .endif -.else +.elif !defined(KERN_OPTS) KERN_OPTS!=cat ${KERNBUILDDIR}/opt*.h | awk '{print $$2;}' | sort -u +.export KERN_OPTS .endif diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index a1906cf..834916c 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -144,7 +144,10 @@ MK_${var}:= no MK_${var}_SUPPORT:= no .else .if defined(KERNBUILDDIR) # See if there's an opt_foo.h +.if !defined(OPT_${var}) OPT_${var}!= cat ${KERNBUILDDIR}/opt_${var:tl}.h; echo +.export OPT_${var} +.endif .if ${OPT_${var}} == "" # nothing -> no MK_${var}_SUPPORT:= no .else |
