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.

Sign up for GitHub

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
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c624f47
libc/tests: Fix installation without MK_TOOLCHAIN
markjdb May 28, 2024
6857bb6
libc/tests: Further refine the condition for installing h_raw
markjdb Jun 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/libc/tests/ssp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@
# now on amd64 when it trips the stack bounds specified in t_ssp.sh . This
# probably needs to be fixed as it's currently hardcoded.
.if ${COMPILER_TYPE} == "clang" && !defined(_SKIP_BUILD) && \
(!defined(_RECURSING_PROGS) || ${PROG} == "h_raw")
(!defined(_RECURSING_PROGS) || ${PROG} == "h_raw") && \
defined(MK_CLANG) && ${MK_CLANG} == "yes"
.include "${SRCTOP}/lib/libclang_rt/compiler-rt-vars.mk"
_libclang_rt_ubsan= ${SYSROOT}${SANITIZER_LIBDIR}/libclang_rt.ubsan_standalone-${CRTARCH}.a
.if exists(${_libclang_rt_ubsan})

Check failure on line 37 in lib/libc/tests/ssp/Makefile

View workflow job for this annotation

GitHub Actions / Style Checker 

Missing Signed-off-by: line
PROGS+= h_raw
LDADD.h_raw+= ${SANITIZER_LDFLAGS}
.else
Expand Down
Loading