diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-08-06 12:03:21 +0200 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-08-09 18:45:31 +0200 |
| commit | d9f78edfd81b9e484423534360350ef7253cc888 (patch) | |
| tree | 6e30db618bb1e5aa190c3aa1b514e8fb6b8cf056 /scripts/Makefile.build | |
| parent | kbuild: revive single target %.ko (diff) | |
| download | linux-d9f78edfd81b9e484423534360350ef7253cc888.tar.xz linux-d9f78edfd81b9e484423534360350ef7253cc888.zip | |
kbuild: fix false-positive need-builtin calculation
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>
Diffstat (limited to 'scripts/Makefile.build')
| -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 0d434d0afc0b..3fe0c73e002c 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -487,7 +487,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. # --------------------------------------------------------------------------- |