diff options
| author | ian <ian@FreeBSD.org> | 2015-06-06 18:21:16 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2015-06-06 18:21:16 +0000 |
| commit | 88ef926e034fc11a69b78108e4dcff4600b878ea (patch) | |
| tree | ebbc4a05aa9a6f3df6ae62ce3e81d00fa0666f17 /sys/conf/kern.pre.mk | |
| parent | f4aec12940559f327d914a748d3bcfb809090a1a (diff) | |
| download | FreeBSD-src-88ef926e034fc11a69b78108e4dcff4600b878ea.zip FreeBSD-src-88ef926e034fc11a69b78108e4dcff4600b878ea.tar.gz | |
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.
Diffstat (limited to 'sys/conf/kern.pre.mk')
| -rw-r--r-- | sys/conf/kern.pre.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 966a9e8..6725bf4 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -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 |
