Skip to content

Commit 8fb0adb

Browse files
author
Herton R. Krzesinski
committed
kbuild: do not add $(srctree) or $(objtree) to header search paths
JIRA: https://issues.redhat.com/browse/RHEL-107194 commit 9dcb47a Author: Masahiro Yamada <masahiroy@kernel.org> Date: Sat Apr 27 23:55:00 2024 +0900 kbuild: do not add $(srctree) or $(objtree) to header search paths scripts/Makefile.lib is included not only from scripts/Makefile.build but also from scripts/Makefile.{vmlinux,modfinal} for building generated C files. In scripts/Makefile.{vmlinux,modfinal}, $(obj) and $(src) are empty. Therefore, the header include paths: -I $(srctree)/$(src) -I $(objtree)/$(obj) ... become meaningless code: -I $(srctree)/ -I $(objtree)/ Add these paths only when 'obj' and 'src' are defined. Reported-by: kernel test robot <lkp@intel.com> Link: https://lore.kernel.org/oe-kbuild-all/202404170634.BlqTaYA0-lkp@intel.com/ Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nicolas Schier <n.schier@avm.de> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
1 parent 20d30d8 commit 8fb0adb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scripts/Makefile.lib

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@ endif
202202
# $(objtree)/$(obj) for including generated headers from checkin source files
203203
ifeq ($(KBUILD_EXTMOD),)
204204
ifdef building_out_of_srctree
205-
_c_flags += -I $(srctree)/$(src) -I $(objtree)/$(obj)
206-
_a_flags += -I $(srctree)/$(src) -I $(objtree)/$(obj)
207-
_cpp_flags += -I $(srctree)/$(src) -I $(objtree)/$(obj)
205+
_c_flags += $(addprefix -I $(srctree)/,$(src)) $(addprefix -I $(objtree)/,$(obj))
206+
_a_flags += $(addprefix -I $(srctree)/,$(src)) $(addprefix -I $(objtree)/,$(obj))
207+
_cpp_flags += $(addprefix -I $(srctree)/,$(src)) $(addprefix -I $(objtree)/,$(obj))
208208
endif
209209
endif
210210

0 commit comments

Comments
 (0)