From nobody Tue May 28 12:26:32 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 4VpWw90XXCz5M9hM; Tue, 28 May 2024 12:26:33 +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 4VpWw86k6nz4hQl; Tue, 28 May 2024 12:26:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716899192; 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=P2SMrd3ZSktZxivGfc0S7xhJ3pY2wHVnCCEc7zVBmVU=; b=LbnXdm0S5YDE+63IvZUUmW8kZAmTSxJcByAuuMQSDnk6/PcNrpN4UaRaDy+StjMd0YArxi V9zgKr6AprOC9e/bu7vjoMwjd/aw7K+Pv6pCVNI2036ZWooTV+Avjo/Pdm6/4saNZZadjr ga7X75lf+xqjuEBpVdjJcmu2yV6bXgqMc7QZTmtFt7kz2feNn/+ScP4tOiD9kIST4FOKju d33iPN409WHuExGO3qZSWwdlFAyp5WLUcHQQnDf3CdWyCQghXcDW6bjXEp7213yDOso7qK 2Pu8YiCg/wP7QiEPjBbGk/0jTW0haG9mnaKIuzWXb+Z0j10eAMQsXtcMPfVrgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716899192; a=rsa-sha256; cv=none; b=BXCaMEynW8o0KQ3EiLXJzeCqZIJTx37AA0l/SVw1Y2vNiB9Zqb/dxJYAJ6MjgcRZfDwdz+ Ca9sUjs0BLt/63ss5ACTrPs+JKPZZXpSQMxr5XMy+zMX2nUcADQpfQN1YLUdv4XdKTsr20 UVqbzLd6UKJniMPm5aw6Y2TwZNjrYFbiw8rt3cZhy9HBdoBXQfmqdVFSXoAMpLSHvwPEay zl7s8lIo0Ky7uluMh97DFte/UWs92AmRUZ+mcWiOheT8fFsIW1BP3j+Baou5lQSyKmjZgM UVXGPpl+btb/vR5pSygYLoU8o5I/G6pdqXyf8lLO0auS25CFdJclMbyt18Yl1g== 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=1716899192; 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=P2SMrd3ZSktZxivGfc0S7xhJ3pY2wHVnCCEc7zVBmVU=; b=dy2pXoVQYng8jyNpsHHyPYpID1SqE9uCW4kdpokLJgQUVOn4r7rwy739TfWAnSiGaU8jts ReRnp2cwRjgfI/4tokUY19cJ9tKEpCwzDLhTt0Txy4uf67EC0JrYfMgvzai/NDiAI4yryV qbBVcdBJk7Ot5XKnxhh34RodHe9Kzs8xHLq2kBZnvB8goYjJWz5MibdQna280Tv69W6EVH WAynTvWChUsaT4/A7ZI7VG88+sNOlkEuP6fnBxx0JnwOuXzTK4s87fmorLaAOqoxIYw4F4 D0aHckTA0WsttpDhWXQsDm4h28r7HfdZqepgZA8Qhx8JIo6fqw7AX1Dmo78mtQ== 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 4VpWw85qwZz1RWT; Tue, 28 May 2024 12:26:32 +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 44SCQWEt037954; Tue, 28 May 2024 12:26:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SCQW8o037951; Tue, 28 May 2024 12:26:32 GMT (envelope-from git) Date: Tue, 28 May 2024 12:26:32 GMT Message-Id: <202405281226.44SCQW8o037951@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: 8164d511d6a6 - main - libc/tests: Fix installation without MK_TOOLCHAIN 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: 8164d511d6a6053df82911e7d4ebb34fff3d765c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8164d511d6a6053df82911e7d4ebb34fff3d765c commit 8164d511d6a6053df82911e7d4ebb34fff3d765c Author: Mark Johnston AuthorDate: 2024-05-28 12:24:43 +0000 Commit: Mark Johnston CommitDate: 2024-05-28 12:24:43 +0000 libc/tests: Fix installation without MK_TOOLCHAIN There is some exotic conditional logic here to avoid building a particular test if a certain UBSAN library isn't present in the toolchain sysroot. This causes build failures for me when doing an "installworld WITHOUT_TOOLCHAIN=", which I do frequently during tests. I believe the problem is that SYSROOT is unset during installworld, so the build sees the host's copy of libclang_rt.ubsan_standalone.a and then tries to install a binary that wasn't built during buildworld. Try to make the check a bit less fragile. Reviewed by: dim MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D45035 --- lib/libc/tests/ssp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile index 22f48d7dfe54..2907d1a621bf 100644 --- a/lib/libc/tests/ssp/Makefile +++ b/lib/libc/tests/ssp/Makefile @@ -30,7 +30,7 @@ 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") + (!defined(_RECURSING_PROGS) || ${PROG} == "h_raw") && ${MK_TOOLCHAIN} == "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})