diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2015-04-16 22:34:10 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2015-04-16 22:34:10 +0000 |
| commit | 7dd824c370b73e1d0674a8f61551213593d8395b (patch) | |
| tree | 85d9b7d816c16258512bea040df0b920150172e6 /sys/conf/kern.pre.mk | |
| parent | dec32474f0ba1288bc3b0a10c864ec65ce2d831e (diff) | |
| download | src-7dd824c370b73e1d0674a8f61551213593d8395b.tar.gz src-7dd824c370b73e1d0674a8f61551213593d8395b.zip | |
Fix kernel build ${MACHINE} path
$M should be the kernel machine src directory, ${MACHINE}. In most cases
${MACHINE} and ${MACHINE_CPUARCH} are the same, but this is not true for
pc98 and arm64.
It appears we previously set M=${MACHINE_CPUARCH} as a workaround to
accommodate pc98, where MACHINE_CPUARCH is pc98 but it uses
sys/i386/i386/genassym.c.
arm64 relies on this being set correctly, so update $M and add explicit
workarounds for pc98.
Differential Revision: https://reviews.freebsd.org/D2307
Reviewed by: andrew, imp
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=281627
Diffstat (limited to 'sys/conf/kern.pre.mk')
| -rw-r--r-- | sys/conf/kern.pre.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index cc16d15b1e72..99ada0508294 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -26,7 +26,7 @@ KODIR?= /boot/${KERNEL} LDSCRIPT_NAME?= ldscript.$M LDSCRIPT?= $S/conf/${LDSCRIPT_NAME} -M= ${MACHINE_CPUARCH} +M= ${MACHINE} AWK?= awk CP?= cp |