Skip to content

Commit 9dcb47a

Browse files
committed
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 <[email protected]> Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Signed-off-by: Masahiro Yamada <[email protected]> Reviewed-by: Nicolas Schier <[email protected]>
1 parent b957df3 commit 9dcb47a

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
@@ -213,9 +213,9 @@ endif
213213
# $(objtree)/$(obj) for including generated headers from checkin source files
214214
ifeq ($(KBUILD_EXTMOD),)
215215
ifdef building_out_of_srctree
216-
_c_flags += -I $(srctree)/$(src) -I $(objtree)/$(obj)
217-
_a_flags += -I $(srctree)/$(src) -I $(objtree)/$(obj)
218-
_cpp_flags += -I $(srctree)/$(src) -I $(objtree)/$(obj)
216+
_c_flags += $(addprefix -I $(srctree)/,$(src)) $(addprefix -I $(objtree)/,$(obj))
217+
_a_flags += $(addprefix -I $(srctree)/,$(src)) $(addprefix -I $(objtree)/,$(obj))
218+
_cpp_flags += $(addprefix -I $(srctree)/,$(src)) $(addprefix -I $(objtree)/,$(obj))
219219
endif
220220
endif
221221

0 commit comments

Comments
 (0)