From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-kbuild@vger.kernel.org
Cc: Jan Kiszka <jan.kiszka@siemens.com>,
Tom Stonecypher <thomas.edwardx.stonecypher@intel.com>,
linux-kernel@vger.kernel.org,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Michal Marek <michal.lkml@markovi.net>
Subject: [PATCH 2/3] kbuild: generate modules.order only in directories visited by obj-y/m
Date: Tue, 6 Aug 2019 19:03:22 +0900 [thread overview]
Message-ID: <20190806100323.22919-2-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <20190806100323.22919-1-yamada.masahiro@socionext.com>
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.
They would become orphan anyway.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
scripts/Makefile.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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) \
PHONY += $(subdir-ym)
$(subdir-ym):
$(Q)$(MAKE) $(build)=$@ \
- need-builtin=$(if $(filter $@/built-in.a, $(subdir-obj-y)),1)
+ need-builtin=$(if $(filter $@/built-in.a, $(subdir-obj-y)),1) \
+ need-modorder=$(if $(need-modorder),$(if $(filter $@/modules.order, $(modorder)),1))
# Add FORCE to the prequisites of a target to force it to be always rebuilt.
# ---------------------------------------------------------------------------
--
2.17.1
next prev parent reply other threads:[~2019-08-06 10:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-06 10:03 [PATCH 1/3] kbuild: fix false-positive need-builtin Masahiro Yamada
2019-08-06 10:03 ` Masahiro Yamada [this message]
2019-08-06 10:03 ` [PATCH 3/3] kbuild: show hint if subdir-y/m is used to visit module Makefile Masahiro Yamada
2019-08-08 6:29 ` Masahiro Yamada
2019-08-07 15:22 ` [PATCH 1/3] kbuild: fix false-positive need-builtin Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190806100323.22919-2-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=jan.kiszka@siemens.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
--cc=thomas.edwardx.stonecypher@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).