Kbuild: don't add obj tree in additional includes (db547ef1) · Commits · 戴 / test

When building with separate object directories and driver specific Makefiles that add additional header include paths, Kbuild adjusts the gcc flags so that we include both the directory in the source tree and in the object tree. However, due to another bug I fixed earlier, this did not actually include the correct directory in the object tree, so we know that we only really need the source tree here. Also, including the object tree sometimes causes warnings about nonexisting directories when the include path only exists in the source. This changes the logic to only emit the -I argument for the srctree, not for objects. We still need both $(srctree)/$(src) and $(obj) though, so I'm adding them manually. Signed-off-by:

Arnd Bergmann <arnd@arndb.de> Signed-off-by:

Michal Marek <mmarek@suse.com>

scripts/Kbuild.include

+1 −1

Original line number	Diff line number	Diff line
		@@ -202,7 +202,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj
		# Prefix -I with $(srctree) if it is not an absolute path.
		# skip if -I has no parameter
		addtree = $(if $(patsubst -I%,%,$(1)), \
		$(if $(filter-out -I/% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1))
		$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)))

		# Find all -I options and call addtree
		flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))

scripts/Makefile.lib

+4 −3

Original line number	Diff line number	Diff line
		@@ -155,7 +155,8 @@ else
		# $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files
		# and locates generated .h files
		# FIXME: Replace both with specific CFLAGS* statements in the makefiles
		__c_flags = $(call addtree,-I$(obj)) $(call flags,_c_flags)
		__c_flags = $(if $(obj),-I$(srctree)/$(src) -I$(obj)) \
		$(call flags,_c_flags)
		__a_flags = $(call flags,_a_flags)
		__cpp_flags = $(call flags,_cpp_flags)
		endif

Admin message