git: 2422138952d8 - main - Fix the KCSAN_ENABLED check when building modules
Andrew Turner
andrew at FreeBSD.org
Wed Jun 2 11:17:03 UTC 2021
The branch main has been updated by andrew:
URL: https://cgit.FreeBSD.org/src/commit/?id=2422138952d86dd8b02ff33c55f747ca8e381afe
commit 2422138952d86dd8b02ff33c55f747ca8e381afe
Author: Andrew Turner <andrew at FreeBSD.org>
AuthorDate: 2021-06-02 10:07:55 +0000
Commit: Andrew Turner <andrew at FreeBSD.org>
CommitDate: 2021-06-02 10:59:19 +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.
Reported by: rstone
Sponsored by: Innovate UK
---
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 4e830b8f5115..bb25c7277d85 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -38,7 +38,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
More information about the dev-commits-src-main
mailing list