diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-02-21 11:19:49 -0800 | 
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-02-21 11:19:49 -0800 | 
| commit | 7ae9fb1b7ecbb5d85d07857943f677fd1a559b18 (patch) | |
| tree | dbdd35328f43569c38c4ce193cefd7d2b6b9fbfd /scripts/generate_rust_analyzer.py | |
| parent | 9c445d2637c938a800fcc8b5f0b10e60c94460c7 (diff) | |
| parent | 9e69e845ae95227949c400af1037dca023f73038 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.3 merge window.
Diffstat (limited to 'scripts/generate_rust_analyzer.py')
| -rwxr-xr-x | scripts/generate_rust_analyzer.py | 8 | 
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py index 75bb611bd751..ecc7ea9a4dcf 100755 --- a/scripts/generate_rust_analyzer.py +++ b/scripts/generate_rust_analyzer.py @@ -68,6 +68,12 @@ def generate_crates(srctree, objtree, sysroot_src):      crates[-1]["proc_macro_dylib_path"] = "rust/libmacros.so"      append_crate( +        "build_error", +        srctree / "rust" / "build_error.rs", +        ["core", "compiler_builtins"], +    ) + +    append_crate(          "bindings",          srctree / "rust"/ "bindings" / "lib.rs",          ["core"], @@ -78,7 +84,7 @@ def generate_crates(srctree, objtree, sysroot_src):      append_crate(          "kernel",          srctree / "rust" / "kernel" / "lib.rs", -        ["core", "alloc", "macros", "bindings"], +        ["core", "alloc", "macros", "build_error", "bindings"],          cfg=cfg,      )      crates[-1]["source"] = {  | 
