From fb90d86466c422b01847ef7950eb901d2262bb00 Mon Sep 17 00:00:00 2001
From: Ed Schouten <ed@FreeBSD.org>
Date: Sat, 27 Aug 2016 09:50:11 +0000
Subject: [PATCH] Properly use MACHINE_CPUARCH for finding cloudabi*_sysvec.c.

The build of the cloudabi32 kernel module currently fails for PC98. In
the case of PC98, we just want to use the code for i386.

Reported by:	np
---
 sys/modules/cloudabi32/Makefile | 2 +-
 sys/modules/cloudabi64/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/modules/cloudabi32/Makefile b/sys/modules/cloudabi32/Makefile
index ffaf854f7ca..074d0fc7b26 100644
--- a/sys/modules/cloudabi32/Makefile
+++ b/sys/modules/cloudabi32/Makefile
@@ -3,7 +3,7 @@
 SYSDIR?=${.CURDIR}/../..
 
 .PATH: ${SYSDIR}/compat/cloudabi32
-.PATH: ${SYSDIR}/${MACHINE}/cloudabi32
+.PATH: ${SYSDIR}/${MACHINE_CPUARCH}/cloudabi32
 
 KMOD=	cloudabi32
 SRCS=	cloudabi32_fd.c cloudabi32_module.c cloudabi32_poll.c \
diff --git a/sys/modules/cloudabi64/Makefile b/sys/modules/cloudabi64/Makefile
index e63c7077a21..05332ec5740 100644
--- a/sys/modules/cloudabi64/Makefile
+++ b/sys/modules/cloudabi64/Makefile
@@ -3,7 +3,7 @@
 SYSDIR?=${.CURDIR}/../..
 
 .PATH: ${SYSDIR}/compat/cloudabi64
-.PATH: ${SYSDIR}/${MACHINE}/cloudabi64
+.PATH: ${SYSDIR}/${MACHINE_CPUARCH}/cloudabi64
 
 KMOD=	cloudabi64
 SRCS=	cloudabi64_fd.c cloudabi64_module.c cloudabi64_poll.c \