diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-08-06 06:03:22 -0400 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-08-09 12:45:31 -0400 |
commit | 4f2c8f3089f538f556c86f26603a062865e4aa94 (patch) | |
tree | 5623b2390e270084e969a981b496824fd5aee194 | |
parent | d9f78edfd81b9e484423534360350ef7253cc888 (diff) |
kbuild: generate modules.order only in directories visited by obj-y/m
The modules.order files in directories visited by the chain of obj-y
or obj-m are merged to the upper-level ones, and become parts of the
top-level modules.order. On the other hand, there is no need to
generate modules.order in directories visited by subdir-y or subdir-m
since they would become orphan anyway.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-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 3fe0c73e002c..37a1d2cd49d4 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build | |||
@@ -488,7 +488,8 @@ targets += $(call intermediate_targets, .asn1.o, .asn1.c .asn1.h) \ | |||
488 | PHONY += $(subdir-ym) | 488 | PHONY += $(subdir-ym) |
489 | $(subdir-ym): | 489 | $(subdir-ym): |
490 | $(Q)$(MAKE) $(build)=$@ \ | 490 | $(Q)$(MAKE) $(build)=$@ \ |
491 | need-builtin=$(if $(filter $@/built-in.a, $(subdir-obj-y)),1) | 491 | need-builtin=$(if $(filter $@/built-in.a, $(subdir-obj-y)),1) \ |
492 | need-modorder=$(if $(need-modorder),$(if $(filter $@/modules.order, $(modorder)),1)) | ||
492 | 493 | ||
493 | # Add FORCE to the prequisites of a target to force it to be always rebuilt. | 494 | # Add FORCE to the prequisites of a target to force it to be always rebuilt. |
494 | # --------------------------------------------------------------------------- | 495 | # --------------------------------------------------------------------------- |