Date: Thu, 7 Jul 2022 20:55:14 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 0b09867f6714 - main - Simplify conditional guards for libclang_rt. Message-ID: <202207072055.267KtEpV055934@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0b09867f671465d0703cc374972c455af594538c commit 0b09867f671465d0703cc374972c455af594538c Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-07-07 20:54:57 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-07-07 20:54:57 +0000 Simplify conditional guards for libclang_rt. All supported architectures can build libclang_rt now. Reviewed by: dim Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D35740 --- lib/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 816374552f0a..482e4d603f4b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -180,11 +180,8 @@ SUBDIR.${MK_LDNS}+= libldns SUBDIR.${MK_STATS}+= libstats # The libraries under libclang_rt can only be built by clang and when we enable -# C++ support. Furthermore, they can only be built for certain architectures. -.if ${COMPILER_TYPE} == "clang" && ${MK_CXX} != "no" && \ - (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386" || \ - ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "riscv") +# C++ support. +.if ${COMPILER_TYPE} == "clang" && ${MK_CXX} != "no" _libclang_rt= libclang_rt .elif (${MK_ASAN} != "no" || ${MK_UBSAN} != "no") && make(all) .error Requested build with sanitizers but cannot build runtime libraries!
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207072055.267KtEpV055934>