aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Schouten <ed@FreeBSD.org>2016-08-29 07:48:35 +0000
committerEd Schouten <ed@FreeBSD.org>2016-08-29 07:48:35 +0000
commitbab6a051ecd3474e1ccae8bc753680a51309021b (patch)
tree4a496f11b4133ae9c788771768f5b02dee5eb7ad
parentcff8ef76a4cf1bbf9c1d9ae1844e20d3753210e7 (diff)
downloadsrc-bab6a051ecd3474e1ccae8bc753680a51309021b.tar.gz
src-bab6a051ecd3474e1ccae8bc753680a51309021b.zip
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.
Notes
Notes: svn path=/head/; revision=304991
-rw-r--r--sys/modules/cloudabi32/Makefile1
-rw-r--r--sys/modules/cloudabi64/Makefile1
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/modules/cloudabi32/Makefile b/sys/modules/cloudabi32/Makefile
index 074d0fc7b267..10851bdba26d 100644
--- a/sys/modules/cloudabi32/Makefile
+++ b/sys/modules/cloudabi32/Makefile
@@ -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 \
diff --git a/sys/modules/cloudabi64/Makefile b/sys/modules/cloudabi64/Makefile
index 05332ec57401..17698542ea54 100644
--- a/sys/modules/cloudabi64/Makefile
+++ b/sys/modules/cloudabi64/Makefile
@@ -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 \