Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bsd.compat.mk: Error if NEED_COMPAT is set but not HAS_COMPAT #881

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from

Conversation

jrtc27
Copy link
Member

@jrtc27 jrtc27 commented Jan 8, 2021

The motivation behind this is that, as Morello userspace is slowly merged in, we will have a period where only hybrid can be built, and we want to make sure that we never build NEED_COMPAT=CHERI programs as hybrid (such as cheribsdtest-purecap), which is something that accidentally ended up happing during the CHERI-RISC-V bring-up due to this bug. Instead we should make sure to add (MACHINE_ABI:Mpurecap || MK_COMPAT_CHERIABI) checks guarding such programs, not MACHINE_CPU:Mcheri.

@jrtc27 jrtc27 requested a review from brooksdavis January 8, 2021 16:24
@jrtc27 jrtc27 force-pushed the need-compat-error branch from afbbf62 to 1c3c7d7 Compare January 8, 2021 16:45
@arichardson
Copy link
Member

Maybe add "Reverts bfcbe6b" ?

@jrtc27
Copy link
Member Author

jrtc27 commented Jan 8, 2021

Oh, hm, presumably that means the bug still stands then :(

@paulmetzger paulmetzger deleted the need-compat-error branch July 11, 2022 10:37
@jrtc27 jrtc27 restored the need-compat-error branch July 11, 2022 14:53
@jrtc27 jrtc27 reopened this Jul 11, 2022
@brooksdavis
Copy link
Member

@jrtc27
Copy link
Member Author

jrtc27 commented Nov 14, 2023

Have you tested that with CheriBSD? IIRC our bsd.compat.mk includes src.opts.mk and so Andy's upstream change doesn't help us. Though perhaps we could get rid of that diff anyway.

@brooksdavis
Copy link
Member

I verified that make cleandir; make cleandir works on CheriBSD which I believe was the original issue (past self didn't do a great job of documenting it though...)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants