Commit 1b83ef9f authored by Onur Özkan's avatar Onur Özkan Committed by Miguel Ojeda
Browse files

scripts: generate_rust_analyzer: remove sysroot assertion 

With nixpkgs's rustc, rust-src component is not bundled
with the compiler by default and is instead provided from
a separate store path, so this assumption does not hold.

The assertion assumes these paths are in the same location
which causes `make LLVM=1 rust-analyzer` to fail on NixOS.

Link: https://rust-for-linux.zulipchat.com/#narrow/stream/x/topic/x/near/565284250


Signed-off-by: default avatarOnur Özkan <work@onurozkan.dev>
Reviewed-by: default avatarGary Guo <gary@garyguo.net>
Fixes: fe992163 ("rust: Support latest version of `rust-analyzer`")
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20251224135343.32476-1-work@onurozkan.dev


[ Reworded title. - Miguel ]
Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent af20ae33

scripts/generate_rust_analyzer.py

+0 −3
Original line number Diff line number Diff line
@@ -213,9 +213,6 @@ def main(): 
        level=logging.INFO if args.verbose else logging.WARNING

    )



    # Making sure that the `sysroot` and `sysroot_src` belong to the same toolchain.

    assert args.sysroot in args.sysroot_src.parents



    rust_project = {

        "crates": generate_crates(args.srctree, args.objtree, args.sysroot_src, args.exttree, args.cfgs, args.core_edition),

        "sysroot": str(args.sysroot),