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

Fix install of CheriBSD/amd64 on FreeBSD/amd64 hosts #2206

Merged
merged 2 commits into from
Aug 26, 2024

Conversation

bsdjhb
Copy link
Collaborator

@bsdjhb bsdjhb commented Aug 26, 2024

  • libc/tests: Fix installation without MK_TOOLCHAIN
  • libc/tests: Further refine the condition for installing h_raw

There is some exotic conditional logic here to avoid building a
particular test if a certain UBSAN library isn't present in the
toolchain sysroot.  This causes build failures for me when doing an
"installworld WITHOUT_TOOLCHAIN=", which I do frequently during tests.

I believe the problem is that SYSROOT is unset during installworld, so
the build sees the host's copy of libclang_rt.ubsan_standalone.a and
then tries to install a binary that wasn't built during buildworld.  Try
to make the check a bit less fragile.

Reviewed by:	dim
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D45035

(cherry picked from commit 8164d51)
See 8164d51 ("libc/tests: Fix installation without MK_TOOLCHAIN")
for some background.  Here we should really be testing MK_CLANG instead,
since that's what gates compilation of libclang_rt.

Fixes:	8164d51 ("libc/tests: Fix installation without MK_TOOLCHAIN")
(cherry picked from commit da925fc)
@bsdjhb bsdjhb merged commit 6748c50 into CTSRD-CHERI:dev Aug 26, 2024
29 checks passed
@bsdjhb bsdjhb deleted the amd64_install_fix branch August 26, 2024 18:29
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.

2 participants