Skip to content

Commit

Permalink
Remove an obsolete hack from the cheribsd buildworld target
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
markjdb authored and arichardson committed Feb 9, 2025
1 parent c076906 commit b46b9f8
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions pycheribuild/projects/cross/cheribsd.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
BuildType,
CheriConfig,
ComputedDefaultValue,
CPUArchitecture,
DefaultInstallDir,
GitRepository,
MakeCommandKind,
Expand Down Expand Up @@ -1100,10 +1099,6 @@ def _setup_arch_specific_options(self) -> str:
def buildworld_args(self) -> MakeOptions:
self._setup_make_args() # ensure make args are complete
result = self.make_args.copy()
if self.crosscompile_target.is_cheri_hybrid([CPUArchitecture.RISCV64]):
# CheriBSD installworld currently gets very confused that libcheri CCDL is forced to false and attempts
# to install the files during installworld.
result.set_with_options(CDDL=False)
result.update(self.cross_toolchain_config)
return result

Expand Down

0 comments on commit b46b9f8

Please sign in to comment.