Skip to content

Commit 87edbf0

Browse files
ojedafbq
authored andcommitted
rust: work around bindgen 0.69.0 issue
`bindgen` 0.69.0 contains a bug: `--version` does not work without providing a header [1]: error: the following required arguments were not provided: <HEADER> Usage: bindgen <FLAGS> <OPTIONS> <HEADER> -- <CLANG_ARGS>... Thus, in preparation for supporting several `bindgen` versions, work around the issue by passing a dummy argument. Include a comment so that we can remove the workaround in the future. Link: rust-lang/rust-bindgen#2678 [1] Reviewed-by: Finn Behrens <me@kloenk.dev> Tested-by: Benno Lossin <benno.lossin@proton.me> Tested-by: Andreas Hindborg <a.hindborg@samsung.com> Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Link: https://lore.kernel.org/r/20240709160615.998336-9-ojeda@kernel.org
1 parent 582b896 commit 87edbf0

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

init/Kconfig

+4-1
Original file line numberDiff line numberDiff line change
@@ -1928,7 +1928,10 @@ config RUSTC_VERSION_TEXT
19281928
config BINDGEN_VERSION_TEXT
19291929
string
19301930
depends on RUST
1931-
default $(shell,command -v $(BINDGEN) >/dev/null 2>&1 && $(BINDGEN) --version || echo n)
1931+
# The dummy parameter `workaround-for-0.69.0` is required to support 0.69.0
1932+
# (https://github.com/rust-lang/rust-bindgen/pull/2678). It can be removed when
1933+
# the minimum version is upgraded past that (0.69.1 already fixed the issue).
1934+
default $(shell,command -v $(BINDGEN) >/dev/null 2>&1 && $(BINDGEN) --version workaround-for-0.69.0 || echo n)
19321935

19331936
#
19341937
# Place an empty function call at each tracepoint site. Can be

scripts/rust_is_available.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,12 @@ fi
121121
# Check that the Rust bindings generator is suitable.
122122
#
123123
# 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). It can be removed when
127+
# the minimum version is upgraded past that (0.69.1 already fixed the issue).
124128
rust_bindings_generator_output=$( \
125-
LC_ALL=C "$BINDGEN" --version 2>/dev/null
129+
LC_ALL=C "$BINDGEN" --version workaround-for-0.69.0 2>/dev/null
126130
) || rust_bindings_generator_code=$?
127131
if [ -n "$rust_bindings_generator_code" ]; then
128132
echo >&2 "***"

0 commit comments

Comments
 (0)