From nobody Sun Jun 09 14:09:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vxxd93WCqz5MC21; Sun, 09 Jun 2024 14:09:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vxxd92RYhz4BJF; Sun, 9 Jun 2024 14:09:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717942157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rh2zhORkkTvBVFxnHF4n17g31xx8DS6GhQHkpjv6j8Y=; b=LqHA9makIaKIseVF4glALwh3Ye1cXT7Zye+wqlFNjn5TaqDEIIlNgzbaY0d/7uJXnGwxbo 6sATcD8hXrx9Kx359MF4OhKdBo/4oLhfBGfOSRPZxaUlVFndc6OOu3RTSV5BuKWdJRP/q8 eBkxkth5wxS6+l9U6L2PDG1S8ouAFiixw8BmgEPtRWZJbwmrgsNUuP5fzW4eyabBYDGHOu L3r5v63spuKMs/R1r/vTMcG9fm/naNoT0bp084A3MY7QKb8O3DxbkvLSHIaE8aEXcnvOaS 71fN5QftIPpye+ZVHqFcQfeeqGbUBwWQGCt1KA54sKO3A9ubxz9gY7Ww60dHjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717942157; a=rsa-sha256; cv=none; b=g+vtbTdZqn6HBDJ+aSK+gq6aAVx9u9+id+uGdU5DBAbOkAynWitpjPVjeTh0UGX60SQjyF e3IS2fAL60oez1jp3jnM3tCAsaHY6SZnrsCxXgZt05AkuSkwaXqnMFVuyhOmc/63qi2TXr 7cOIQm3dyKuVQzWoHNu9K1T8z92jpd8gL5iATZkqZAZDFVtDoFleQIquLXOsBSlpHqxULo XVdibEZIfR7V2vv6OYgndBZrnTjaLEP/K9Xojr7steQunLV51bDZs/60F4sbVpK2bne44X 77u/dBnjFeuMw6Wgwb+lnB+c62652DG0vYh4dH8GiaLts49xXoVAPxd/o5XQ1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717942157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rh2zhORkkTvBVFxnHF4n17g31xx8DS6GhQHkpjv6j8Y=; b=TDmD0M42HDD9VWMkczkxJjd0IRhCF1s1odezNNafKPoikCNAzD3ZOSBUM0OHHEyU4zr2Lp 0MrVTAK8EIdzQyqvTBqTMdm1F1UmouqafqQJ/dcCJB77071Zz644K3kjiShnyQaJsMHUN0 FTiwUW95tA0JOC+il+rIBwHytHPj/lFDK9TWGOWzEUXflU9m8Dp2HA/0v2pusUq+tP4Gr/ 0j2O+SsEeRrt1NQvIAQ1Jr06yLQHM/DsZa8pK3GQBEWvyxWMny8fZa5ErCCBBv6W4Gt6KV Y9ZVPJ/D/0CBkfOIHtdt4cSkiMKNEU1J7VPjTdSf0tIZu5K8BQ7WgKGFrq+kKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vxxd923DVzlj6; Sun, 9 Jun 2024 14:09:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 459E9H54070499; Sun, 9 Jun 2024 14:09:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 459E9HSq070496; Sun, 9 Jun 2024 14:09:17 GMT (envelope-from git) Date: Sun, 9 Jun 2024 14:09:17 GMT Message-Id: <202406091409.459E9HSq070496@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: da925fcebf39 - main - libc/tests: Further refine the condition for installing h_raw List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da925fcebf397cc3bfc74b7aa9757efd6231aa00 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da925fcebf397cc3bfc74b7aa9757efd6231aa00 commit da925fcebf397cc3bfc74b7aa9757efd6231aa00 Author: Mark Johnston AuthorDate: 2024-06-01 15:30:16 +0000 Commit: Mark Johnston 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})