summaryrefslogtreecommitdiff
path: root/rust/Makefile
diff options
context:
space:
mode:
authorMiguel Ojeda <ojeda@kernel.org>2026-04-02 10:28:41 +0200
committerMiguel Ojeda <ojeda@kernel.org>2026-04-02 10:28:41 +0200
commit3418d862679ac6da0b6bd681b18b3189c4fad20d (patch)
treeec6514b74a852b9d3aedddb9d1ec497d08b31b33 /rust/Makefile
parent3a2486cc1da5cf637fe5da4540929d67c4540022 (diff)
parent5c8d16ac49405c5b77c955684849528f7d4d6b81 (diff)
Merge tag 'rust-analyzer-v7.1' of https://github.com/Rust-for-Linux/linux into rust-next
Pull rust-analyzer updates from Tamir Duberstein: - Add type annotations to 'generate_rust_analyzer.py'. - Add support for scripts written in Rust ('generate_rust_target.rs', 'rustdoc_test_builder.rs', 'rustdoc_test_gen.rs'). - Refactor 'generate_rust_analyzer.py' to explicitly identify host and target crates, improve readability, and reduce duplication. * tag 'rust-analyzer-v7.1' of https://github.com/Rust-for-Linux/linux: scripts: generate_rust_analyzer.py: reduce cfg plumbing scripts: generate_rust_analyzer.py: rename cfg to generated_cfg scripts: generate_rust_analyzer.py: avoid FD leak scripts: generate_rust_analyzer.py: define scripts scripts: generate_rust_analyzer.py: identify crates explicitly scripts: generate_rust_analyzer.py: add type hints scripts: generate_rust_analyzer.py: drop `"is_proc_macro": false` scripts: generate_rust_analyzer.py: extract `{build,register}_crate`
Diffstat (limited to 'rust/Makefile')
-rw-r--r--rust/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/rust/Makefile b/rust/Makefile
index 5eca6a817966..96cd7d8e6ee9 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -610,6 +610,8 @@ rust-analyzer:
--cfgs='proc_macro2=$(proc_macro2-cfgs)' \
--cfgs='quote=$(quote-cfgs)' \
--cfgs='syn=$(syn-cfgs)' \
+ --cfgs='pin_init_internal=$(pin_init_internal-cfgs)' \
+ --cfgs='pin_init=$(pin_init-cfgs)' \
$(realpath $(srctree)) $(realpath $(objtree)) \
$(rustc_sysroot) $(RUST_LIB_SRC) $(if $(KBUILD_EXTMOD),$(srcroot)) \
> rust-project.json