diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile
--- a/sys/modules/iwlwifi/Makefile
+++ b/sys/modules/iwlwifi/Makefile
@@ -91,7 +91,9 @@
 #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
-
 .include <bsd.kmod.mk>
+
+CWARNFLAGS.drv.c+=	-Wno-override-init
+.if ${COMPILER_TYPE} == "clang"
+CWARNFLAGS.drv.c+=	-Wno-initializer-overrides
+.endif