From: Masahiro Yamada yamada.masahiro@socionext.com
[ Upstream commit d9f78edfd81b9e484423534360350ef7253cc888 ]
The current implementation of need-builtin is false-positive, for example, in the following Makefile:
obj-m := foo/ obj-y := foo/bar/
..., where foo/built-in.a is not required.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Stable-dep-of: 2e3d0e20d845 ("ARM: dts: exynos: correct TMU phandle in Odroid HC1") Signed-off-by: Sasha Levin sashal@kernel.org --- scripts/Makefile.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 64fac0ad32d6b..7635cc05fcfa3 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -541,7 +541,8 @@ targets += $(call intermediate_targets, .asn1.o, .asn1.c .asn1.h) \
PHONY += $(subdir-ym) $(subdir-ym): - $(Q)$(MAKE) $(build)=$@ need-builtin=$(if $(findstring $@,$(subdir-obj-y)),1) + $(Q)$(MAKE) $(build)=$@ \ + need-builtin=$(if $(filter $@/built-in.a, $(subdir-obj-y)),1)
# Add FORCE to the prequisites of a target to force it to be always rebuilt. # ---------------------------------------------------------------------------