From: Miguel Ojeda <ojeda@kernel.org>
To: Miguel Ojeda <ojeda@kernel.org>,
Alex Gaynor <alex.gaynor@gmail.com>,
Wedson Almeida Filho <wedsonaf@gmail.com>,
Masahiro Yamada <masahiroy@kernel.org>
Cc: "Boqun Feng" <boqun.feng@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Benno Lossin" <benno.lossin@proton.me>,
"Andreas Hindborg" <a.hindborg@samsung.com>,
"Alice Ryhl" <aliceryhl@google.com>,
rust-for-linux@vger.kernel.org,
"Nathan Chancellor" <nathan@kernel.org>,
"Nicolas Schier" <nicolas@fjasle.eu>,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
patches@lists.linux.dev
Subject: [PATCH 4/6] kbuild: rust: rebuild if the version text changes
Date: Fri, 9 Aug 2024 00:11:36 +0200 [thread overview]
Message-ID: <20240808221138.873750-5-ojeda@kernel.org> (raw)
In-Reply-To: <20240808221138.873750-1-ojeda@kernel.org>
Now that `RUSTC_VERSION_TEXT` exists, use it to rebuild `core` when the
version text changes (which in turn will trigger a rebuild of all the
kernel Rust code).
This also applies to proc macros (which only work with the `rustc` that
compiled them), via the already existing dependency on `core.o`. That
is cleaned up in the next commit.
However, this does not cover host programs written in Rust, which is
the same case in the C side.
This is accomplished by referencing directly the generated file, instead
of using the `fixdep` header trick, since we cannot change the Rust
standard library sources. This is not too much of a burden, since it
only needs to be done for `core`.
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
---
Masahiro: I used `$(objtree)` here since we still use it in the rest of
this `Makefile`, but please let me know if you prefer otherwise. Thanks!
rust/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/rust/Makefile b/rust/Makefile
index 6c0644b6090c..966743a9ee25 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -370,7 +370,8 @@ $(obj)/core.o: private skip_clippy = 1
$(obj)/core.o: private skip_flags = -Wunreachable_pub
$(obj)/core.o: private rustc_objcopy = $(foreach sym,$(redirect-intrinsics),--redefine-sym $(sym)=__rust$(sym))
$(obj)/core.o: private rustc_target_flags = $(core-cfgs)
-$(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs FORCE
+$(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs \
+ $(wildcard $(objtree)/include/config/RUSTC_VERSION_TEXT) FORCE
+$(call if_changed_dep,rustc_library)
ifneq ($(or $(CONFIG_X86_64),$(CONFIG_X86_32)),)
$(obj)/core.o: scripts/target.json
--
2.46.0
next prev parent reply other threads:[~2024-08-08 22:12 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-08 22:11 [PATCH 0/6] kbuild: rust: add `RUSTC_VERSION` and reconfig/rebuild support Miguel Ojeda
2024-08-08 22:11 ` [PATCH 1/6] kbuild: rust: add `CONFIG_RUSTC_VERSION` Miguel Ojeda
2024-08-17 12:42 ` Nicolas Schier
2024-08-08 22:11 ` [PATCH 2/6] kbuild: rust: make command for `RUSTC_VERSION_TEXT` closer to the `CC` one Miguel Ojeda
2024-08-09 17:52 ` Masahiro Yamada
2024-08-10 11:37 ` Miguel Ojeda
2024-08-10 13:44 ` Björn Roy Baron
2024-08-10 14:45 ` Miguel Ojeda
2024-08-08 22:11 ` [PATCH 3/6] kbuild: rust: re-run Kconfig if the version text changes Miguel Ojeda
2024-08-17 12:58 ` Nicolas Schier
2024-08-17 13:28 ` Miguel Ojeda
2024-08-08 22:11 ` Miguel Ojeda [this message]
2024-08-17 13:04 ` [PATCH 4/6] kbuild: rust: rebuild " Nicolas Schier
2024-08-17 13:36 ` Miguel Ojeda
2024-08-17 15:49 ` Nicolas Schier
2024-09-02 17:40 ` Miguel Ojeda
2024-08-08 22:11 ` [PATCH 5/6] kbuild: rust: replace proc macros dependency on `core.o` with the version text Miguel Ojeda
2024-08-09 17:31 ` Masahiro Yamada
2024-08-10 11:36 ` Miguel Ojeda
2024-08-08 22:11 ` [PATCH 6/6] docs: rust: include other expressions in conditional compilation section Miguel Ojeda
2024-08-19 7:28 ` [PATCH 0/6] kbuild: rust: add `RUSTC_VERSION` and reconfig/rebuild support Alice Ryhl
2024-09-02 17:40 ` Miguel Ojeda
2024-09-05 1:19 ` Masahiro Yamada
2024-09-05 20:47 ` Miguel Ojeda
2024-09-05 23:59 ` 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=20240808221138.873750-5-ojeda@kernel.org \
--to=ojeda@kernel.org \
--cc=a.hindborg@samsung.com \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=gary@garyguo.net \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=nathan@kernel.org \
--cc=nicolas@fjasle.eu \
--cc=patches@lists.linux.dev \
--cc=rust-for-linux@vger.kernel.org \
--cc=wedsonaf@gmail.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).