Archive-only list for patches
 help / color / mirror / Atom feed
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 3/6] kbuild: rust: re-run Kconfig if the version text changes
Date: Fri,  9 Aug 2024 00:11:35 +0200	[thread overview]
Message-ID: <20240808221138.873750-4-ojeda@kernel.org> (raw)
In-Reply-To: <20240808221138.873750-1-ojeda@kernel.org>

Re-run Kconfig if we detect the Rust compiler has changed via the version
text, like it is done for C.

Unlike C, and unlike `RUSTC_VERSION`, the `RUSTC_VERSION_TEXT` is kept
under `depends on RUST`, since it should not be needed unless `RUST`
is enabled.

Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
---
Masahiro: I think leaving the `depends on RUST` in `RUSTC_VERSION` is
OK, but since this is different from the C side, please let me know if
you prefer otherwise. Thanks!

 Makefile     | 5 +++--
 init/Kconfig | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 8ad55d6e7b60..2b5f9f098b6f 100644
--- a/Makefile
+++ b/Makefile
@@ -648,9 +648,10 @@ endif

 # The expansion should be delayed until arch/$(SRCARCH)/Makefile is included.
 # Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.
-# CC_VERSION_TEXT is referenced from Kconfig (so it needs export),
+# CC_VERSION_TEXT and RUSTC_VERSION_TEXT are referenced from Kconfig (so they need export),
 # and from include/config/auto.conf.cmd to detect the compiler upgrade.
 CC_VERSION_TEXT = $(subst $(pound),,$(shell LC_ALL=C $(CC) --version 2>/dev/null | head -n 1))
+RUSTC_VERSION_TEXT = $(subst $(pound),,$(shell LC_ALL=C $(RUSTC) --version 2>/dev/null | head -n 1))

 ifneq ($(findstring clang,$(CC_VERSION_TEXT)),)
 include $(srctree)/scripts/Makefile.clang
@@ -671,7 +672,7 @@ ifdef config-build
 # KBUILD_DEFCONFIG may point out an alternative default configuration
 # used for 'make defconfig'
 include $(srctree)/arch/$(SRCARCH)/Makefile
-export KBUILD_DEFCONFIG KBUILD_KCONFIG CC_VERSION_TEXT
+export KBUILD_DEFCONFIG KBUILD_KCONFIG CC_VERSION_TEXT RUSTC_VERSION_TEXT

 config: outputmakefile scripts_basic FORCE
 	$(Q)$(MAKE) $(build)=scripts/kconfig $@
diff --git a/init/Kconfig b/init/Kconfig
index 2f974f412374..b0238c4b6e79 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1926,7 +1926,9 @@ config RUST
 config RUSTC_VERSION_TEXT
 	string
 	depends on RUST
-	default "$(shell,LC_ALL=C $(RUSTC) --version 2>/dev/null | head -n 1)"
+	default "$(RUSTC_VERSION_TEXT)"
+	help
+	  See `CC_VERSION_TEXT`.

 config BINDGEN_VERSION_TEXT
 	string
--
2.46.0

  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 ` Miguel Ojeda [this message]
2024-08-17 12:58   ` [PATCH 3/6] kbuild: rust: re-run Kconfig if the version text changes Nicolas Schier
2024-08-17 13:28     ` Miguel Ojeda
2024-08-08 22:11 ` [PATCH 4/6] kbuild: rust: rebuild " Miguel Ojeda
2024-08-17 13:04   ` 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-4-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