git: ceee15225781 - stable/13 - LinuxKPI: add the "dummy" includes directory to builds
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 17 Oct 2022 20:41:44 UTC
The branch stable/13 has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=ceee152257810d8379fe51c989f2b81c066cdd6e
commit ceee152257810d8379fe51c989f2b81c066cdd6e
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2022-09-23 21:25:07 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2022-10-17 20:37:05 +0000
LinuxKPI: add the "dummy" includes directory to builds
While we could add the dummy includes directory manually to only the
drivers needing it, it seems a lot easier to simply add it to all
without any expected harm.
This is needed for more drivers (and to remove some #ifdef in current
ones) with empty header files being present not yielding errors.
Sponsored by: The FreeBSD Foundation
Reviewed by: hselasky, imp
Differential Revision: https://reviews.freebsd.org/D36684
(cherry picked from commit f8bad56164a43aa108498a97bd0021a943c0a02e)
---
sys/conf/kern.pre.mk | 3 ++-
sys/conf/kmod.mk | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index c4c63d591541..f2f69342c865 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -311,7 +311,8 @@ NORMAL_CTFCONVERT= @:
.endif
# Linux Kernel Programming Interface C-flags
-LINUXKPI_INCLUDES= -I$S/compat/linuxkpi/common/include
+LINUXKPI_INCLUDES= -I$S/compat/linuxkpi/common/include \
+ -I$S/compat/linuxkpi/dummy/include
LINUXKPI_C= ${NORMAL_C} ${LINUXKPI_INCLUDES}
# Infiniband C flags. Correct include paths and omit errors that linux
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 36ea024dae9a..9faccaf76de1 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -107,7 +107,8 @@ LINUXKPI_GENSRCS+= \
opt_stack.h
LINUXKPI_INCLUDES+= \
- -I${SYSDIR}/compat/linuxkpi/common/include
+ -I${SYSDIR}/compat/linuxkpi/common/include \
+ -I${SYSDIR}/compat/linuxkpi/dummy/include
CFLAGS+= ${WERROR}
CFLAGS+= -D_KERNEL