summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornetchild <netchild@FreeBSD.org>2010-03-25 13:47:21 +0000
committernetchild <netchild@FreeBSD.org>2010-03-25 13:47:21 +0000
commit2f9c438c7714403eb93207d6ff8980460a6ece72 (patch)
tree6b8ef15d35bc0bf38f0c44505408b359d760afc6
parent95992079a2ba5bae4a88077e1e907121f5a428a7 (diff)
downloadFreeBSD-src-2f9c438c7714403eb93207d6ff8980460a6ece72.zip
FreeBSD-src-2f9c438c7714403eb93207d6ff8980460a6ece72.tar.gz
Propagate CONF_CFLAGS (from makeoptions) to the module build too.
Discussed with: jhb (on arch@)
-rw-r--r--sys/conf/kern.post.mk4
-rw-r--r--sys/conf/kmod.mk3
2 files changed, 7 insertions, 0 deletions
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index ed56568..f808c95 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -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 \
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 6d543e4..0f8b4ff 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -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 \
OpenPOWER on IntegriCloud