svn commit: r278458 - head/sys/conf

[Warner Losh]

Author: imp
Date: Mon Feb  9 16:03:59 2015
New Revision: 278458
URL: https://svnweb.freebsd.org/changeset/base/278458

Log:
  Pass MODULES_EXTRA to the modules build. While I'm here, also always
  pass WITHOUT_MODULES down. There's no need to make this conditional.
  
  Submitted by: Guy Yur

Modified:
  head/sys/conf/kern.pre.mk

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Mon Feb  9 16:03:55 2015	(r278457)
+++ head/sys/conf/kern.pre.mk	Mon Feb  9 16:03:59 2015	(r278458)
@@ -186,15 +186,13 @@ SYSTEM_DEP+= ${LDSCRIPT}
 MKMODULESENV+=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
 MKMODULESENV+=	MACHINE_CPUARCH=${MACHINE_CPUARCH}
 MKMODULESENV+=	MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH}
+MKMODULESENV+=	MODULES_EXTRA=${MODULES_EXTRA} WITHOUT_MODULES=${WITHOUT_MODULES}
 .if (${KERN_IDENT} == LINT)
 MKMODULESENV+=	ALL_MODULES=LINT
 .endif
 .if defined(MODULES_OVERRIDE)
 MKMODULESENV+=	MODULES_OVERRIDE="${MODULES_OVERRIDE}"
 .endif
-.if defined(WITHOUT_MODULES)
-MKMODULESENV+=	WITHOUT_MODULES="${WITHOUT_MODULES}"
-.endif
 .if defined(DEBUG)
 MKMODULESENV+=	DEBUG_FLAGS="${DEBUG}"
 .endif