mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-18 10:35:55 +00:00
Code Issues Releases Activity

Simple compatibility hacks for building on older systems where

Browse Source 
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).
This commit is contained in:
Warner Losh 2010-07-15 23:32:53 +00:00
parent 337744d9a6
commit f50baba14b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=210151
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/conf/kern.pre.mk
View File

@ -5,6 +5,9 @@
.include <bsd.own.mk> .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 # Can be overridden by makeoptions or /etc/make.conf
KERNEL_KO?= kernel KERNEL_KO?= kernel
KERNEL?= kernel KERNEL?= kernel
@ -151,6 +154,7 @@ SYSTEM_DEP+= ${LDSCRIPT}
# them. # them.
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
MKMODULESENV+= MACHINE_CPUARCH=${MACHINE_CPUARCH}
.if (${KERN_IDENT} == LINT) .if (${KERN_IDENT} == LINT)
MKMODULESENV+= ALL_MODULES=LINT MKMODULESENV+= ALL_MODULES=LINT
.endif .endif

3
sys/conf/kmod.mk
View File

@ -60,6 +60,9 @@
# Unload a module. # 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 AWK?= awk
KMODLOAD?= /sbin/kldload KMODLOAD?= /sbin/kldload
KMODUNLOAD?= /sbin/kldunload KMODUNLOAD?= /sbin/kldunload