kbuild: do not drop -I without parameter (48f6e3cf) · Commits · 戴 / test

The comment line for addtree says "skip if -I has no parameter". What it actually does is "drop if -I has no parameter". For example, if you have the compiler flag '-I foo' (a space between), it will be converted to 'foo'. This completely changes the meaning. What we want is, "do nothing" for -I without parameter so that '-I foo' is kept as-is. Signed-off-by:

Masahiro Yamada <yamada.masahiro@socionext.com>

scripts/Kbuild.include

+1 −1

Original line number	Diff line number	Diff line
		@@ -214,7 +214,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./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)))
		$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)),$(1))

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

Admin message