diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-08-06 19:03:21 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-17 08:31:43 +0100 |
| commit | a4912c4b0b1cdf8d03ab450f3aabf24c7b1a37db (patch) | |
| tree | 62581c0881812a3c8363a2e91ff663ce6aeca354 | |
| parent | 1dc71eeb198a8daa17d0c995998a53b0b749a158 (diff) | |
| download | msm-a4912c4b0b1cdf8d03ab450f3aabf24c7b1a37db.tar.gz | |
kbuild: fix false-positive need-builtin calculation
[ 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>
| -rw-r--r-- | scripts/Makefile.build | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 64fac0ad32d6..7635cc05fcfa 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. # --------------------------------------------------------------------------- |