Linux 6.14-rc3

[linux.git] / scripts / generate_rust_analyzer.py

diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
index 09e1d166d8d236fcf8c2b2375624b243ebf6e7f7..aa8ea1a4dbe5f9037c8c231d87ddc8d95c297f12 100755 (executable)
--- a/scripts/generate_rust_analyzer.py
+++ b/scripts/generate_rust_analyzer.py
@@ -8,6 +8,7 @@ import json
 import logging
 import os
 import pathlib
 import logging
 import os
 import pathlib

+import subprocess

 import sys
 
 def args_crates_cfgs(cfgs):
 import sys
 
 def args_crates_cfgs(cfgs):


@@ -35,8 +36,7 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
     crates_cfgs = args_crates_cfgs(cfgs)
 
     def append_crate(display_name, root_module, deps, cfg=[], is_workspace_member=True, is_proc_macro=False):
     crates_cfgs = args_crates_cfgs(cfgs)
 
     def append_crate(display_name, root_module, deps, cfg=[], is_workspace_member=True, is_proc_macro=False):

-        crates_indexes[display_name] = len(crates)
-        crates.append({
+        crate = {

             "display_name": display_name,
             "root_module": str(root_module),
             "is_workspace_member": is_workspace_member,
             "display_name": display_name,
             "root_module": str(root_module),
             "is_workspace_member": is_workspace_member,


@@ -47,7 +47,15 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
             "env": {
                 "RUST_MODFILE": "This is only for rust-analyzer"
             }
             "env": {
                 "RUST_MODFILE": "This is only for rust-analyzer"
             }

-        })
+        }
+        if is_proc_macro:
+            proc_macro_dylib_name = subprocess.check_output(
+                [os.environ["RUSTC"], "--print", "file-names", "--crate-name", display_name, "--crate-type", "proc-macro", "-"],
+                stdin=subprocess.DEVNULL,
+            ).decode('utf-8').strip()
+            crate["proc_macro_dylib_path"] = f"{objtree}/rust/{proc_macro_dylib_name}"
+        crates_indexes[display_name] = len(crates)
+        crates.append(crate)

 
     # First, the ones in `rust/` since they are a bit special.
     append_crate(
 
     # First, the ones in `rust/` since they are a bit special.
     append_crate(


@@ -70,7 +78,6 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
         [],
         is_proc_macro=True,
     )
         [],
         is_proc_macro=True,
     )

-    crates[-1]["proc_macro_dylib_path"] = f"{objtree}/rust/libmacros.so"

 
     append_crate(
         "build_error",
 
     append_crate(
         "build_error",