From 400ab789dffde2c6bbe58e6320d8470e836ea513 Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Wed, 28 Feb 2024 23:02:39 +0000 Subject: [PATCH] cheribsd: Stop building amd64 with WITHOUT_BHYVE This was disabled back in 2017 but builds just fine today (even 22.12; tested 23.11 on Linux and 22.12 on macOS), so must have been fixed in the interim. Unclear exactly what the issue was and thus when it got fixed. --- pycheribuild/projects/cross/cheribsd.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pycheribuild/projects/cross/cheribsd.py b/pycheribuild/projects/cross/cheribsd.py index fe3b8641f..9bf7185bc 100644 --- a/pycheribuild/projects/cross/cheribsd.py +++ b/pycheribuild/projects/cross/cheribsd.py @@ -1487,10 +1487,6 @@ def add_cross_build_options(self) -> None: # links from /usr/bin/mail to /usr/bin/Mail won't work on case-insensitve fs self.make_args.set_with_options(MAIL=False) - if self.crosscompile_target.is_any_x86(): - # seems to be missing some include paths which appears to work on freebsd - self.make_args.set_with_options(BHYVE=False) - def libcompat_name(self) -> str: if self.crosscompile_target.is_cheri_purecap(): return "lib64"