summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2010-07-15 23:32:53 +0000
committerimp <imp@FreeBSD.org>2010-07-15 23:32:53 +0000
commit699b4feb6f8e1958ec4ce2c29a2a791f89924d17 (patch)
treed78b333d3faace1e1eda6989eb9ef30597df9851
parent4d060f9861644db617f85fad13832fb65bef30cc (diff)
downloadFreeBSD-src-699b4feb6f8e1958ec4ce2c29a2a791f89924d17.zip
FreeBSD-src-699b4feb6f8e1958ec4ce2c29a2a791f89924d17.tar.gz
Simple compatibility hacks for building on older systems where
MACHINE_CPUARCH isn't defined. I believe that this will cover all options. I didn't define it in kern.mk because $M is set to MACHINE_CPUARCH and then is expanded for the genassym.o rule in kern.post.mk and kern.mk is included after this, so the expansion isn't quite right. I think this is a bug in make, but don't have the time to track it to ground (and even if I did, fixing it would require a MFC of the change to the very old systems we're targetting with this fix).
-rw-r--r--sys/conf/kern.pre.mk4
-rw-r--r--sys/conf/kmod.mk3
2 files changed, 7 insertions, 0 deletions
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 7cf1e78..fe8c4b5 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -5,6 +5,9 @@
.include <bsd.own.mk>
+# backwards compat option for older systems.
+MACHINE_CPUARCH?=${MACHINE_ARCH:C/mipse[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
+
# Can be overridden by makeoptions or /etc/make.conf
KERNEL_KO?= kernel
KERNEL?= kernel
@@ -151,6 +154,7 @@ SYSTEM_DEP+= ${LDSCRIPT}
# them.
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
+MKMODULESENV+= MACHINE_CPUARCH=${MACHINE_CPUARCH}
.if (${KERN_IDENT} == LINT)
MKMODULESENV+= ALL_MODULES=LINT
.endif
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 663586b..b817b1b 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -60,6 +60,9 @@
# Unload a module.
#
+# backwards compat option for older systems.
+MACHINE_CPUARCH?=${MACHINE_ARCH:C/mipse[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
+
AWK?= awk
KMODLOAD?= /sbin/kldload
KMODUNLOAD?= /sbin/kldunload
OpenPOWER on IntegriCloud