The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=da925fcebf397cc3bfc74b7aa9757efd6231aa00
commit da925fcebf397cc3bfc74b7aa9757efd6231aa00
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2024-06-01 15:30:16 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2024-06-09 14:08:31 +0000
libc/tests: Further refine the condition for installing h_raw
See 8164d511d6a6 ("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: 8164d511d6a6 ("libc/tests: Fix installation without MK_TOOLCHAIN")
---
lib/libc/tests/ssp/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile
index 2907d1a621bf..0f5b56505134 100644
--- a/lib/libc/tests/ssp/Makefile
+++ b/lib/libc/tests/ssp/Makefile
@@ -30,7 +30,8 @@ PROGS+= h_memset
# 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") && ${MK_TOOLCHAIN} ==
"yes"
+ (!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})
