From nobody Mon Jul 29 16:12:58 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 4WXk0p3mp5z5RWZq; Mon, 29 Jul 2024 16:12:58 +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 4WXk0p35JBz49S1; Mon, 29 Jul 2024 16:12:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722269578; 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=1JfKO5Y6XiX6Ks5cLc0QsBO2LDLcZCgdgJfVnvQ1U84=; b=W60wlHnpP1c8EvWSUJOkgW7ORW0iqXjQyUgBwOvK51W/Xfl98OAh7NjmRsaL3WiX/rg7AM 3F7jgVNelC6MPLWoNe57cEEHZNCJ5M5Xk7peS+5sSPEpFw/D8a9ujoE5A3ae2C/wBppajY UDVfCVOYMbEsv1QTqtwxzKUFBfn10ARdzG6lwsAsYtqe3EidN4if2JFJSpDc2NI88vLip4 y2sSX+QyJzUgWxauGz7ODgUr26sPAfZCQP10mqZu7h5Gkh/6+2A4BwpsqChJomHov9g/aM ny//Hq2nSt9iz8TNAfSvKF+uXIx/RcQTHxaZKETPkFlcIkyqM4upF0qoKTYmZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722269578; a=rsa-sha256; cv=none; b=AOK6RrMYdE1ARyfCgThLQBj3VG3uVso1xtJc0wWfcxQttdA3otw+aH1olbpN0jMJiDjvrt +T2POW3/zFsJBis7HhEOpX9Px9zlK0gl19aJhuu0LAvfPOfX2BwuGmbU+4MsMfWK9J+hN5 6mHr5Re4+xk//Ei9Xg3Chh1eQzZWpy0SnryYOoeVeJOlCLgqCHGCCAXS7yU+DbvY4Dvdyw yITp9eIkZdM/Fmts6f8o1FkKjoocxGnl0xl5FYXclRkx8KiLDS89DgyRQjWSs4xbMMp0fc t2G+YQmqWPl+DVR6DII0W+M6DAgvjtwsUJvv1YwBjGGIcTR3fYsMVT+p9aKvUQ== 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=1722269578; 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=1JfKO5Y6XiX6Ks5cLc0QsBO2LDLcZCgdgJfVnvQ1U84=; b=sgc6esPNIJtLsXV8A6ohYW4FL26BqD747ATRw5to4gE9nh4dmcddTCOkUC3GINVuIFgqPi bkE2Ly/C0QbWPzRXe433Qfw05DFYdbrZoHF5vDQImoYfFK7ZW09aEUpmDwBnaOx+XXaKcz GlG6vcrDeifLnVn5VTdA7Vh16DkDT1dFhzzi+XQefsKF5CgeapVDZ7msDD9ybeZx2Na85p 8bji0LwSB3CTvqCsJd8NP9OxvTyYd0uDiUxLOIoxOnq1+EBaFiWDTBFLWsRn735uwU2qUB XcuOz5FKcZVIg5jfWPfQgewSHQ55oMS7x84hdtgJllrfeagg8KbI3EEDNPmnHA== 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 4WXk0p2hqmzhQn; Mon, 29 Jul 2024 16:12:58 +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 46TGCwxD070157; Mon, 29 Jul 2024 16:12:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46TGCwnR070154; Mon, 29 Jul 2024 16:12:58 GMT (envelope-from git) Date: Mon, 29 Jul 2024 16:12:58 GMT Message-Id: <202407291612.46TGCwnR070154@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: c8701777c0e8 - stable/13 - Fix the KCSAN_ENABLED check when building modules 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/13 X-Git-Reftype: branch X-Git-Commit: c8701777c0e8654f060e46b067dd86452f48c364 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c8701777c0e8654f060e46b067dd86452f48c364 commit c8701777c0e8654f060e46b067dd86452f48c364 Author: Andrew Turner AuthorDate: 2021-06-02 10:07:55 +0000 Commit: Mark Johnston CommitDate: 2024-07-29 16:10:50 +0000 Fix the KCSAN_ENABLED check when building modules The KCSAN_ENABLED variable is non-empty when the kernel is being built with KCSAN. This allows us to disable modules that are known to be broken. There was a bug where we would check if it was defined. As this is always the case the KCSAN_ENABLED variable would be set when building modules so we would never build such a module. Fix this by checking if the value is empty before passing it on to the module stage. This doesn't affect how modules are built as the CFLAGS passed to modules has the correct check. PR: 280212 Reported by: rstone Sponsored by: Innovate UK (cherry picked from commit 2422138952d86dd8b02ff33c55f747ca8e381afe) --- sys/conf/kern.post.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 4e22c07ef8d8..6664afc2bf16 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -37,7 +37,7 @@ MKMODULESENV+= WITH_CTF="${WITH_CTF}" MKMODULESENV+= WITH_EXTRA_TCP_STACKS="${WITH_EXTRA_TCP_STACKS}" .endif -.if defined(KCSAN_ENABLED) +.if !empty(KCSAN_ENABLED) MKMODULESENV+= KCSAN_ENABLED="yes" .endif