svn commit: r210151 - head/sys/conf

[Warner Losh]

Author: imp
Date: Thu Jul 15 23:32:53 2010
New Revision: 210151
URL: http://svn.freebsd.org/changeset/base/210151

Log:
  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).

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

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Thu Jul 15 23:24:06 2010	(r210150)
+++ head/sys/conf/kern.pre.mk	Thu Jul 15 23:32:53 2010	(r210151)
@@ -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

Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk	Thu Jul 15 23:24:06 2010	(r210150)
+++ head/sys/conf/kmod.mk	Thu Jul 15 23:32:53 2010	(r210151)
@@ -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