Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
rust: kbuild: remove "dummy parameter" workaround for `bindgen` < 0.71.1
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>
+2
-13
+1
-6
init/Kconfig
+1
-6
init/Kconfig
···
2211
2211
config BINDGEN_VERSION_TEXT
2212
2212
string
2213
2213
depends on RUST
2214
-
# The dummy parameter `workaround-for-0.69.0` is required to support 0.69.0
2215
-
# (https://github.com/rust-lang/rust-bindgen/pull/2678) and 0.71.0
2216
-
# (https://github.com/rust-lang/rust-bindgen/pull/3040). It can be removed
2217
-
# when the minimum version is upgraded past the latter (0.69.1 and 0.71.1
2218
-
# both fixed the issue).
2219
-
default "$(shell,$(BINDGEN) --version workaround-for-0.69.0 2>/dev/null)"
2214
+
default "$(shell,$(BINDGEN) --version 2>/dev/null)"
2220
2215
2221
2216
#
2222
2217
# Place an empty function call at each tracepoint site. Can be
+1
-7
scripts/rust_is_available.sh
+1
-7
scripts/rust_is_available.sh
···
121
121
# Check that the Rust bindings generator is suitable.
122
122
#
123
123
# Non-stable and distributions' versions may have a version suffix, e.g. `-dev`.
124
-
#
125
-
# The dummy parameter `workaround-for-0.69.0` is required to support 0.69.0
126
-
# (https://github.com/rust-lang/rust-bindgen/pull/2678) and 0.71.0
127
-
# (https://github.com/rust-lang/rust-bindgen/pull/3040). It can be removed when
128
-
# the minimum version is upgraded past the latter (0.69.1 and 0.71.1 both fixed
129
-
# the issue).
130
124
rust_bindings_generator_output=$( \
131
-
LC_ALL=C "$BINDGEN" --version workaround-for-0.69.0 2>/dev/null
125
+
LC_ALL=C "$BINDGEN" --version 2>/dev/null
132
126
) || rust_bindings_generator_code=$?
133
127
if [ -n "$rust_bindings_generator_code" ]; then
134
128
echo >&2 "***"