Skip to content

Commit

Permalink
libc/tests: Further refine the condition for installing h_raw
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
markjdb authored and bsdjhb committed Aug 26, 2024
1 parent b5e8030 commit 6748c50
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/libc/tests/ssp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down

0 comments on commit 6748c50

Please sign in to comment.