git: 11c79f9e358d - main - arm64: Connect bhyve and libvmmapi to the build

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=11c79f9e358d725dd75d91d2ff2996fd77dc88e5

commit 11c79f9e358d725dd75d91d2ff2996fd77dc88e5
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-04-03 17:44:29 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-04-10 15:17:56 +0000

    arm64: Connect bhyve and libvmmapi to the build
    
    Reviewed by:    corvink, andrew, jhb, emaste
    MFC after:      2 weeks
    Sponsored by:   Innovate UK
    Differential Revision:  https://reviews.freebsd.org/D41742
---
 lib/Makefile                      | 3 +++
 tools/build/options/WITHOUT_BHYVE | 2 +-
 usr.sbin/Makefile.aarch64         | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index a3c4dd966040..cd1476a62d35 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -203,6 +203,9 @@ SUBDIR.${MK_PMC}+=	libopencsd
 
 .if ${MACHINE_CPUARCH} == "amd64"
 SUBDIR.${MK_PMC}+=	libipt
+.endif
+
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64"
 SUBDIR.${MK_BHYVE}+=	libvmmapi
 .endif
 
diff --git a/tools/build/options/WITHOUT_BHYVE b/tools/build/options/WITHOUT_BHYVE
index 44b992b5a286..5d523bc58b0a 100644
--- a/tools/build/options/WITHOUT_BHYVE
+++ b/tools/build/options/WITHOUT_BHYVE
@@ -2,4 +2,4 @@ Do not build or install
 .Xr bhyve 8 ,
 associated utilities, and examples.
 .Pp
-This option only affects amd64/amd64.
+This option only affects amd64/amd64 and arm64/aarch64.
diff --git a/usr.sbin/Makefile.aarch64 b/usr.sbin/Makefile.aarch64
index a72a085ff618..6302b6a78ef7 100644
--- a/usr.sbin/Makefile.aarch64
+++ b/usr.sbin/Makefile.aarch64
@@ -1,4 +1,6 @@
-
 .if ${MK_ACPI} != "no"
 SUBDIR+=	acpi
 .endif
+.if ${MK_BHYVE} != "no"
+SUBDIR+=	bhyve
+.endif