From f5dac37f967c72e3b486d96b547cd9f6471ed2c8 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Fri, 22 Jul 2016 17:31:14 +0000 Subject: [PATCH] Don't run find(1) for __MPATH with NO_MODULES set. It's a waste of time when it won't be used. Submitted by: bde MFC after: 3 days --- sys/conf/config.mk | 2 +- sys/conf/kern.pre.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/conf/config.mk b/sys/conf/config.mk index 433f420c6a7..0a3e7b9834d 100644 --- a/sys/conf/config.mk +++ b/sys/conf/config.mk @@ -54,7 +54,7 @@ KERN_OPTS!=cat ${KERNBUILDDIR}/opt*.h | awk '{print $$2;}' | sort -u .export KERN_OPTS .endif -.if !defined(__MPATH) +.if !defined(NO_MODULES) && !defined(__MPATH) __MPATH!=find ${SYSDIR:tA}/ -name \*_if.m .export __MPATH .endif diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index d5781dba6dd..6b2bd141554 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -192,7 +192,7 @@ SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \ SYSTEM_DEP+= ${LDSCRIPT} # Calculate path for .m files early, if needed. -.if !defined(__MPATH) +.if !defined(NO_MODULES) && !defined(__MPATH) __MPATH!=find ${S:tA}/ -name \*_if.m .endif @@ -212,7 +212,9 @@ MKMODULESENV+= MODULES_OVERRIDE="${MODULES_OVERRIDE}" .if defined(DEBUG) MKMODULESENV+= DEBUG_FLAGS="${DEBUG}" .endif +.if !defined(NO_MODULES) MKMODULESENV+= __MPATH="${__MPATH}" +.endif # Architecture and output format arguments for objdump to convert image to # object file