github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-12 16:18:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rust: kbuild: remove "dummy parameter" workaround for bindgen < 0.71.1

Browse Source 
Until the version bump of `bindgen`, we needed to pass a dummy parameter
to avoid failing the `--version` call.

Thus remove it.

Reviewed-by: Tamir Duberstein <tamird@kernel.org>
Reviewed-by: Gary Guo <gary@garyguo.net>
Link: https://patch.msgid.link/20260405235309.418950-22-ojeda@kernel.org
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This commit is contained in:
Miguel Ojeda 2026-04-06 01:52:57 +02:00
parent 276ed30c55
commit 93553d9922
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
init/Kconfig
View File

@ -2211,12 +2211,7 @@ config RUSTC_VERSION_TEXT
config BINDGEN_VERSION_TEXT config BINDGEN_VERSION_TEXT
string string
depends on RUST depends on RUST
# The dummy parameter `workaround-for-0.69.0` is required to support 0.69.0 default "$(shell,$(BINDGEN) --version 2>/dev/null)"
# (https://github.com/rust-lang/rust-bindgen/pull/2678) and 0.71.0
# (https://github.com/rust-lang/rust-bindgen/pull/3040). It can be removed
# when the minimum version is upgraded past the latter (0.69.1 and 0.71.1
# both fixed the issue).
default "$(shell,$(BINDGEN) --version workaround-for-0.69.0 2>/dev/null)"
# #
# Place an empty function call at each tracepoint site. Can be # Place an empty function call at each tracepoint site. Can be

8
scripts/rust_is_available.sh
View File

@ -121,14 +121,8 @@ fi
# Check that the Rust bindings generator is suitable. # Check that the Rust bindings generator is suitable.
# #
# Non-stable and distributions' versions may have a version suffix, e.g. `-dev`. # Non-stable and distributions' versions may have a version suffix, e.g. `-dev`.
#
# The dummy parameter `workaround-for-0.69.0` is required to support 0.69.0
# (https://github.com/rust-lang/rust-bindgen/pull/2678) and 0.71.0
# (https://github.com/rust-lang/rust-bindgen/pull/3040). It can be removed when
# the minimum version is upgraded past the latter (0.69.1 and 0.71.1 both fixed
# the issue).
rust_bindings_generator_output=$( \ rust_bindings_generator_output=$( \
LC_ALL=C "$BINDGEN" --version workaround-for-0.69.0 2>/dev/null LC_ALL=C "$BINDGEN" --version 2>/dev/null
) || rust_bindings_generator_code=$? ) || rust_bindings_generator_code=$?
if [ -n "$rust_bindings_generator_code" ]; then if [ -n "$rust_bindings_generator_code" ]; then
echo >&2 "***" echo >&2 "***"