Skip to content

Commit b46b9f8

Browse files
markjdbarichardson
authored andcommitted
Remove an obsolete hack from the cheribsd buildworld target
cheribsd commit 2d3d29ceb6a disabled MK_CDDL for purecap riscv due to compilation failures, but that has since been resolved. This hack breaks CI now that MK_CDDL is unconditionally enabled in cheribsd (to enable dtrace on morello).
1 parent c076906 commit b46b9f8

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

pycheribuild/projects/cross/cheribsd.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
BuildType,
4747
CheriConfig,
4848
ComputedDefaultValue,
49-
CPUArchitecture,
5049
DefaultInstallDir,
5150
GitRepository,
5251
MakeCommandKind,
@@ -1100,10 +1099,6 @@ def _setup_arch_specific_options(self) -> str:
11001099
def buildworld_args(self) -> MakeOptions:
11011100
self._setup_make_args() # ensure make args are complete
11021101
result = self.make_args.copy()
1103-
if self.crosscompile_target.is_cheri_hybrid([CPUArchitecture.RISCV64]):
1104-
# CheriBSD installworld currently gets very confused that libcheri CCDL is forced to false and attempts
1105-
# to install the files during installworld.
1106-
result.set_with_options(CDDL=False)
11071102
result.update(self.cross_toolchain_config)
11081103
return result
11091104

0 commit comments

Comments
 (0)