Author: ian
Date: Sat Jun 6 18:21:16 2015
New Revision: 284091
URL: https://svnweb.freebsd.org/changeset/base/284091
Log:
MFC r278458, r278519:
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.
Properly quote EXTRA_MODULES and WITHOUT_MODULES to ensure that they
are passed down properly when there's more than one.
Modified:
stable/10/sys/conf/kern.pre.mk
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/conf/kern.pre.mk
==============================================================================
--- stable/10/sys/conf/kern.pre.mk Sat Jun 6 18:03:36 2015
(r284090)
+++ stable/10/sys/conf/kern.pre.mk Sat Jun 6 18:21:16 2015
(r284091)
@@ -182,15 +182,13 @@ SYSTEM_DEP+= ${LDSCRIPT}
MKMODULESENV+= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
MKMODULESENV+= MACHINE_CPUARCH=${MACHINE_CPUARCH}
+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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
