git: 48ba16f2d42e - stable/15 - iwlwifi: fix the gcc build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 31 Jan 2026 22:51:45 UTC
The branch stable/15 has been updated by ngie:
URL: https://cgit.FreeBSD.org/src/commit/?id=48ba16f2d42eed65938fb9eaa9a793f44b715926
commit 48ba16f2d42eed65938fb9eaa9a793f44b715926
Author: Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2025-11-04 22:52:41 +0000
Commit: Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2026-01-31 22:51:20 +0000
iwlwifi: fix the gcc build
- Only apply the previously added CWARNFLAGS to `drv.c` instead of the
whole module.
- Only apply `-Wno-initializer-overrides` to CWARNFLAGS in the clang
scenario as it's not supported with gcc.
This fixes building the module with gcc and avoids accidentally
introducing tech debt with the module, in the event other issues are
accidentally introduced.
MFC after: 3 days
Fixes: 6b627f8858 ("iwlwifi: update Intel's mvm/mld drivers")
Differential Revision: https://reviews.freebsd.org/D53591
(cherry picked from commit 2ec6a2e5f01120ea8d4e667e7773d8b140e40c75)
---
sys/modules/iwlwifi/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile
index 94b25c261acc..b5441744d77a 100644
--- a/sys/modules/iwlwifi/Makefile
+++ b/sys/modules/iwlwifi/Makefile
@@ -96,7 +96,7 @@ CFLAGS+= -DCONFIG_IWLWIFI_DEVICE_TRACING=1
#CFLAGS+= -DCONFIG_THERMAL=1
#CFLAGS+= -DCONFIG_EFI=1
-# XXX-BZ how to do this just for pcie/drv.c (and gcc vs. clang)?
-CFLAGS += -Wno-override-init -Wno-initializer-overrides
+CWARNFLAGS.clang.drv.c+= -Wno-initializer-overrides
+CWARNFLAGS.drv.c+= -Wno-override-init ${CWARNFLAGS.${COMPILER_TYPE}.${.IMPSRC:T}}
.include <bsd.kmod.mk>