From nobody Sun Jul 14 16:43:20 2024 X-Original-To: dev-commits-src-all@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 4WMWNn3fKxz5Qymd; Sun, 14 Jul 2024 16:43:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WMWNn0wv2z4MKs; Sun, 14 Jul 2024 16:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720975401; 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=Bq82CQOJNP3wInzo4grmY7RFWb45Hbv2qZb5NH2CgCs=; b=vUAhja0abLYsoyWsM269Ov0bvO2N/YMDitF9ZUTfkSqmckdMLC1JrbWhuAqogdIsnw2TON 2f8SD8tgjyDp0RgNv3CmTJy4Zmy+bjGCinJXDaOvGZB5R6Q203mnNZJFVJjF2fhwNA+x8S 1Witd5wzWFX0LiUIdAWllgUA4ZDuV8PEYiUc4BWJrLSV2uyIz7tnx/019ReIHPQK4raG+j ZufPX0ophRIb9G3EUp6XqfEkOFcURzNf0gngTn2AYQ453UE6XjOZhlh0yOt6yThYDTBbmz KgbKf+pJh0sRq+Xrw/Q5fSbJm/V+64yXKy/P1ECw3XgdnSaE0rRFKOzjzW8AEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720975401; a=rsa-sha256; cv=none; b=LKnfx7O3DIMZ57J4CeYV+0djLxrVGwsllgppXPQJNSdWIV/XyCFoTwt35e3SvlhqbkRtaJ tHiO6ftoxNgcLEdiZkH8+SPniviUIYUd+IlIaDh+in3aF5zIEwu2F18N290DRxxRjT9jGq 02B7D0+yRGcIShO/JK1ip2paVgVFp0gmwHtE51YEHbJOvShga6ar90finB4y4qdcjhnb22 Hg5jt0sfEvHtrpYYlTBmrcUrSDv0I6aVQXdC7tyHXZv8jmizUeCd8f9ZTCx9loQuDGuHgx rPE1pqts0pn+jvrp/LCo65Y8WhW/zIxf4/aw0kciRjY0fdQ0AvZwWzWeilt5EQ== 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=1720975401; 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=Bq82CQOJNP3wInzo4grmY7RFWb45Hbv2qZb5NH2CgCs=; b=AnFINjFuJgscDTYVksz9QU5y+hQJLK7rO4SXDvKuaz7aBEWnbL+BpDq3aIuFRLXm/6zdOA /08E0//QhyeT4j535W2JNlwjjUcuif7frvWjy4dWJ6X2QujE9ifHNvL2xrygey9DEGu3t2 4XpCDLqukw5O6f5IRx8AAaJ0khBU08BzAkOWymFPeH9FjDqLiLmUtQFh8xZJibSDsFaa4t 436DU3vvfzhlDczYnkp0wpsnppMx28Rlq6NrrknlQgdahTD5vq9JdBlC95GE4ovckz9+zK rhyvwjZGSxgfqlrOqHRa2pFyz2mmZb72cKTv8cl+v7wYrDMiohbTcbZ28/N0vg== 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 4WMWNm6qDNzHNp; Sun, 14 Jul 2024 16:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46EGhKTD039660; Sun, 14 Jul 2024 16:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46EGhKhY039657; Sun, 14 Jul 2024 16:43:20 GMT (envelope-from git) Date: Sun, 14 Jul 2024 16:43:20 GMT Message-Id: <202407141643.46EGhKhY039657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4ea42d9d468b - stable/14 - libc/tests: Further refine the condition for installing h_raw List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 4ea42d9d468b9ce25871190229b3f0cae69ac909 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4ea42d9d468b9ce25871190229b3f0cae69ac909 commit 4ea42d9d468b9ce25871190229b3f0cae69ac909 Author: Mark Johnston AuthorDate: 2024-06-01 15:30:16 +0000 Commit: Mark Johnston CommitDate: 2024-07-14 16:16:32 +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") (cherry picked from commit da925fcebf397cc3bfc74b7aa9757efd6231aa00) --- 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 7c6f8d2ea0a7..58644d2b5264 100644 --- a/lib/libc/tests/ssp/Makefile +++ b/lib/libc/tests/ssp/Makefile @@ -29,7 +29,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})