Date: Tue, 5 Nov 2024 04:23:59 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 5af09f50d761 - main - include: Add required guards for dev/vmm headers Message-ID: <202411050423.4A54Nxuv066790@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5af09f50d761b6fbe66cc94b1ae854846dbe7e22 commit 5af09f50d761b6fbe66cc94b1ae854846dbe7e22 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2024-11-05 03:12:39 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2024-11-05 04:23:49 +0000 include: Add required guards for dev/vmm headers Reported by: Jenkins Fixes: ebd48f1e52d7 ("include: Install dev/vmm headers") --- include/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/Makefile b/include/Makefile index e0391cac87bb..16d641b42a90 100644 --- a/include/Makefile +++ b/include/Makefile @@ -52,7 +52,7 @@ LSUBDIRS= dev/acpica dev/agp dev/ciss dev/filemon dev/firewire \ dev/hwpmc dev/hyperv \ dev/ic dev/iicbus dev/io dev/mfi dev/mmc \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/pwm \ - dev/smbus dev/speaker dev/tcp_log dev/veriexec dev/vkbd dev/vmm dev/wg \ + dev/smbus dev/speaker dev/tcp_log dev/veriexec dev/vkbd dev/wg \ fs/devfs fs/fdescfs fs/msdosfs fs/nfs fs/nullfs \ fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ @@ -310,6 +310,13 @@ INCS+= iconv.h LSUBDIRS+= dev/usb .endif +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64" || \ + ${MACHINE_CPUARCH} == "riscv" +.if ${MK_BHYVE} != "no" +LSUBDIRS+= dev/vmm +.endif +.endif + .if ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH} != "powerpcspe" _dev_powermac_nvram= dev/powermac_nvram .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411050423.4A54Nxuv066790>