diff options
author | imp <imp@FreeBSD.org> | 2002-01-05 06:21:06 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2002-01-05 06:21:06 +0000 |
commit | ba7a614d5a381c07fbf089ac0c262616d2840382 (patch) | |
tree | 0a7cd869d467dd4d979b7fdda793ca0d8b4bb13e /sys/conf | |
parent | b0bee8fb18a697d60d96e6e18fa94dc3ad26445a (diff) | |
download | FreeBSD-src-ba7a614d5a381c07fbf089ac0c262616d2840382.zip FreeBSD-src-ba7a614d5a381c07fbf089ac0c262616d2840382.tar.gz |
Move initialization of the MKMODULESENV envorinoment to kern.pre.mk
from kern.post.mk so port makefiles can augment it.
Submitted by: nyan
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/kern.post.mk | 18 | ||||
-rw-r--r-- | sys/conf/kern.pre.mk | 11 |
2 files changed, 15 insertions, 14 deletions
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 88bf0a2..b92a434 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -4,6 +4,10 @@ # that need to be included after all the % directives, except %RULES and # things that act like they are part of %RULES # +# Most make variables should not be defined in this file. Instead, they +# should be defined in the kern.pre.mk so that port makefiles can +# oferride or augment them. +# # $FreeBSD$ # @@ -167,14 +171,6 @@ reinstall: modules-reinstall reinstall.debug: modules-reinstall.debug .endif -MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} -.if defined(MODULES_OVERRIDE) -MKMODULESENV+= MODULES_OVERRIDE="${MODULES_OVERRIDE}" -.endif -.if defined(DEBUG) -MKMODULESENV+= DEBUG="${DEBUG}" DEBUG_FLAGS="${DEBUG}" -.endif - modules: @mkdir -p ${.OBJDIR}/modules cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \ @@ -232,10 +228,4 @@ vnode_if.h: $S/kern/vnode_if.pl $S/kern/vnode_if.src vnode_if.o: ${NORMAL_C} -# Commented out for now pending a better solution. -# How do we pick up compiler version specific flags?? -#.if exists($S/../share/mk) -#.include "$S/../share/mk/bsd.kern.mk" -#.else .include <bsd.kern.mk> -#.endif diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 32a675b..06fdf84 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -82,4 +82,15 @@ SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \ ${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET} SYSTEM_DEP+= $S/conf/ldscript.$M +# MKMODULESENV is set here so that port makefiles can augment +# them. + +MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} +.if defined(MODULES_OVERRIDE) +MKMODULESENV+= MODULES_OVERRIDE="${MODULES_OVERRIDE}" +.endif +.if defined(DEBUG) +MKMODULESENV+= DEBUG="${DEBUG}" DEBUG_FLAGS="${DEBUG}" +.endif + all: ${KERNEL_KO} |