svn commit: r303314 - stable/11/sys/conf

[Bryan Drewery]

Author: bdrewery
Date: Mon Jul 25 18:25:19 2016
New Revision: 303314
URL: https://svnweb.freebsd.org/changeset/base/303314

Log:
  MFC r303195:
  
    Don't run find(1) for __MPATH with NO_MODULES set.
  
  Approved by:	re (gjb)

Modified:
  stable/11/sys/conf/config.mk
  stable/11/sys/conf/kern.pre.mk
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/conf/config.mk
==============================================================================
--- stable/11/sys/conf/config.mk	Mon Jul 25 18:24:54 2016	(r303313)
+++ stable/11/sys/conf/config.mk	Mon Jul 25 18:25:19 2016	(r303314)
@@ -54,7 +54,7 @@ KERN_OPTS!=cat ${KERNBUILDDIR}/opt*.h | 
 .export KERN_OPTS
 .endif
 
-.if !defined(__MPATH)
+.if !defined(NO_MODULES) && !defined(__MPATH)
 __MPATH!=find ${SYSDIR:tA}/ -name \*_if.m
 .export __MPATH
 .endif

Modified: stable/11/sys/conf/kern.pre.mk
==============================================================================
--- stable/11/sys/conf/kern.pre.mk	Mon Jul 25 18:24:54 2016	(r303313)
+++ stable/11/sys/conf/kern.pre.mk	Mon Jul 25 18:25:19 2016	(r303314)
@@ -192,7 +192,7 @@ SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symb
 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="${MODUL
 .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