svn commit: r304991 - in head/sys/modules: cloudabi32 cloudabi64

[Ed Schouten]

Author: ed
Date: Mon Aug 29 07:48:35 2016
New Revision: 304991
URL: https://svnweb.freebsd.org/changeset/base/304991

Log:
  Use both the MACHINE and MACHINE_CPUARCH directories for finding sources.
  
  When fixing this module to build on PC98, I actually broke the build on
  ARM64. On PC98 we need to pull in the sources from the MACHINE_CPUARCH
  (i386), but on ARM64 we need to use the MACHINE, as MACHINE_CPUARCH is
  set to aarch64 instead of just arm64.

Modified:
  head/sys/modules/cloudabi32/Makefile
  head/sys/modules/cloudabi64/Makefile

Modified: head/sys/modules/cloudabi32/Makefile
==============================================================================
--- head/sys/modules/cloudabi32/Makefile	Mon Aug 29 07:46:23 2016	(r304990)
+++ head/sys/modules/cloudabi32/Makefile	Mon Aug 29 07:48:35 2016	(r304991)
@@ -4,6 +4,7 @@ SYSDIR?=${.CURDIR}/../..
 
 .PATH: ${SYSDIR}/compat/cloudabi32
 .PATH: ${SYSDIR}/${MACHINE_CPUARCH}/cloudabi32
+.PATH: ${SYSDIR}/${MACHINE}/cloudabi32
 
 KMOD=	cloudabi32
 SRCS=	cloudabi32_fd.c cloudabi32_module.c cloudabi32_poll.c \

Modified: head/sys/modules/cloudabi64/Makefile
==============================================================================
--- head/sys/modules/cloudabi64/Makefile	Mon Aug 29 07:46:23 2016	(r304990)
+++ head/sys/modules/cloudabi64/Makefile	Mon Aug 29 07:48:35 2016	(r304991)
@@ -4,6 +4,7 @@ SYSDIR?=${.CURDIR}/../..
 
 .PATH: ${SYSDIR}/compat/cloudabi64
 .PATH: ${SYSDIR}/${MACHINE_CPUARCH}/cloudabi64
+.PATH: ${SYSDIR}/${MACHINE}/cloudabi64
 
 KMOD=	cloudabi64
 SRCS=	cloudabi64_fd.c cloudabi64_module.c cloudabi64_poll.c \