From nobody Sun Jul 14 16:43:19 2024 X-Original-To: dev-commits-src-branches@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 4WMWNm0Z0zz5QyPF; Sun, 14 Jul 2024 16:43:20 +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 4WMWNl6Lrmz4MNJ; Sun, 14 Jul 2024 16:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720975399; 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=IVV9k/dw/1IZjuupb8P70ZYofN73IdoBn4OqdCJBbNg=; b=R2YhFlKpUiRh0XZez3C/KCdwdKLFSZfq1Wgb/CPIEkJGWA4LCnnKpIeA+SzSgucYc5IkWO sq1ezCFi/a2M7BubltvyGxEem5o0WDW/73mk1wX+nNtTni43SfXOdAke2daZ2U2pwun9up nyLTwBP7Oaf0Ge1HcjZZtpx7xC/LOBq/yEXeMs3K4HBZ90/ZTxZ+K/pKqqXg59jj4M2H2c t/6TGw+8XLLQGXINXdr0eWlHPaUjVoFaWNd6WoH4bDHKnjQk1HSO5iD5G1rhkJjF56O9Li XmB2lS+UiCSwQw846GnVrykKx2a9TDFIzex/oZqtGGAy1vkixPzftUiGABFzfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720975399; a=rsa-sha256; cv=none; b=w8GWtoG82RF8zSZeNXK40qHAKYxc2ri51tHaiv5aVgXHMWLErxcBeoT+5ueqbfEYw6f2Kz JINSRofOk8Jx/ufVOq85wtGwLW+xzqH5alHRG+G5go80axfFCSeo5CkzFHyUoWlXh5h3pd EpHcAgef2CU8GReGtLc/TEEqz1pXNS0c6EL3caMXYbDbts3vURvmSS4E6ipxIQBwOVk1SP CxJnT/vxh4unOBEsgP7Nc2D+o6hQWQVbgC165uJVi9rtWnkLTKBxfCe3lR3vsUB601KKP/ KDI59f/vy9pUGWShaYAsDVmT2/oHQH6ppbR9G4/Vi6S4gC5hgEXVX8RzUp05jg== 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=1720975399; 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=IVV9k/dw/1IZjuupb8P70ZYofN73IdoBn4OqdCJBbNg=; b=hVQT0qOFqaarwPTG4TBuG8GH4EKmXkbUmsGisSyhjEIv/lpoOStry8vZQign3rYMixY8c6 DCZYEzETStEwClizoI8/uMx1YxxXRnjX8LIuc7sEECynHX+hYuqw8BQAViafB4w36IIeTS +/loxgpK9wkyBMQOCbWoWwqctL2tp//5dCcnoLh6oY9jDh2sZYiFtYGJ6SiK6QqWi2FEGm 3aIYZYLc/KP8NXAHCuaguz2qwXm+vRHRzrBiM37AyD1IzxFt48vx45pyZNqDVIPkNLCySL bVQN8iYpvCcfdr8D+z86tF/p5/XtIJAB5/hXi8v8KzmXLyJb7RnNyub3CWgXvg== 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 4WMWNl5ymBzHX8; Sun, 14 Jul 2024 16:43:19 +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 46EGhJ6a039609; Sun, 14 Jul 2024 16:43:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46EGhJoq039606; Sun, 14 Jul 2024 16:43:19 GMT (envelope-from git) Date: Sun, 14 Jul 2024 16:43:19 GMT Message-Id: <202407141643.46EGhJoq039606@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: a3e706fd422a - stable/14 - libc/tests: Fix installation without MK_TOOLCHAIN List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: a3e706fd422ae1b213bad5834b703cb48b07b691 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a3e706fd422ae1b213bad5834b703cb48b07b691 commit a3e706fd422ae1b213bad5834b703cb48b07b691 Author: Mark Johnston AuthorDate: 2024-05-28 12:24:43 +0000 Commit: Mark Johnston CommitDate: 2024-07-14 16:16:22 +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 (cherry picked from commit 8164d511d6a6053df82911e7d4ebb34fff3d765c) --- 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 c6f850ec1a33..7c6f8d2ea0a7 100644 --- a/lib/libc/tests/ssp/Makefile +++ b/lib/libc/tests/ssp/Makefile @@ -29,7 +29,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})