summaryrefslogtreecommitdiffstats
path: root/rust
diff options
context:
space:
mode:
authorVinay Varma <varmavinaym@gmail.com>2023-04-11 17:17:15 +0800
committerMiguel Ojeda <ojeda@kernel.org>2023-08-07 11:33:34 +0200
commit49a9ef76740206d52e7393f6fe25fc764de8df32 (patch)
treeb2565bffc396ec6da74990413791ccb21464920e /rust
parent0beaf546b4f198dd767b5a01a73f24db269ff6e2 (diff)
downloadlinux-49a9ef76740206d52e7393f6fe25fc764de8df32.tar.gz
linux-49a9ef76740206d52e7393f6fe25fc764de8df32.tar.bz2
linux-49a9ef76740206d52e7393f6fe25fc764de8df32.zip
scripts: `make rust-analyzer` for out-of-tree modules
Adds support for out-of-tree rust modules to use the `rust-analyzer` make target to generate the rust-project.json file. The change involves adding an optional parameter `external_src` to the `generate_rust_analyzer.py` which expects the path to the out-of-tree module's source directory. When this parameter is passed, I have chosen not to add the non-core modules (samples and drivers) into the result since these are not expected to be used in third party modules. Related changes are also made to the Makefile and rust/Makefile allowing the `rust-analyzer` target to be used for out-of-tree modules as well. Link: https://github.com/Rust-for-Linux/linux/pull/914 Link: https://github.com/Rust-for-Linux/rust-out-of-tree-module/pull/2 Signed-off-by: Vinay Varma <varmavinaym@gmail.com> Link: https://lore.kernel.org/r/20230411091714.130525-1-varmavinaym@gmail.com Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Diffstat (limited to 'rust')
-rw-r--r--rust/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/rust/Makefile b/rust/Makefile
index 4124bfa01798..1ffdff6c2a34 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -373,8 +373,10 @@ quiet_cmd_rustc_library = $(if $(skip_clippy),RUSTC,$(RUSTC_OR_CLIPPY_QUIET)) L
$(if $(rustc_objcopy),;$(OBJCOPY) $(rustc_objcopy) $@)
rust-analyzer:
- $(Q)$(srctree)/scripts/generate_rust_analyzer.py $(srctree) $(objtree) \
- $(RUST_LIB_SRC) > $(objtree)/rust-project.json
+ $(Q)$(srctree)/scripts/generate_rust_analyzer.py \
+ $(abs_srctree) $(abs_objtree) \
+ $(RUST_LIB_SRC) $(KBUILD_EXTMOD) > \
+ $(if $(KBUILD_EXTMOD),$(extmod_prefix),$(objtree))/rust-project.json
redirect-intrinsics = \
__eqsf2 __gesf2 __lesf2 __nesf2 __unordsf2 \