svn commit: r205640 - head/sys/conf

[Alexander Leidinger]

Author: netchild
Date: Thu Mar 25 13:47:21 2010
New Revision: 205640
URL: http://svn.freebsd.org/changeset/base/205640

Log:
  Propagate CONF_CFLAGS (from makeoptions) to the module build too.
  
  Discussed with:	jhb (on arch@)

Modified:
  head/sys/conf/kern.post.mk
  head/sys/conf/kmod.mk

Modified: head/sys/conf/kern.post.mk
==============================================================================
--- head/sys/conf/kern.post.mk	Thu Mar 25 13:15:55 2010	(r205639)
+++ head/sys/conf/kern.post.mk	Thu Mar 25 13:47:21 2010	(r205640)
@@ -15,6 +15,10 @@ MKMODULESENV+=	DESTDIR="${DESTDIR}"
 SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;}
 MKMODULESENV+=	KERNBUILDDIR="${.CURDIR}" SYSDIR="${SYSDIR}"
 
+.if defined(CONF_CFLAGS)
+MKMODULESENV+=	CONF_CFLAGS="${CONF_CFLAGS}"
+.endif
+
 .MAIN: all
 
 .for target in all clean cleandepend cleandir clobber depend install \

Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk	Thu Mar 25 13:15:55 2010	(r205639)
+++ head/sys/conf/kmod.mk	Thu Mar 25 13:47:21 2010	(r205640)
@@ -325,6 +325,9 @@ ${_src}:
 .endfor
 .endif
 
+# Repsect configuration-specific C flags.
+CFLAGS+=	${CONF_CFLAGS}
+
 MFILES?= dev/acpica/acpi_if.m dev/acpi_support/acpi_wmi_if.m \
 	dev/agp/agp_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \
 	dev/iicbus/iicbb_if.m dev/iicbus/iicbus_if.m \