From: Onur Özkan Date: Wed, 24 Dec 2025 13:53:43 +0000 (+0300) Subject: scripts: generate_rust_analyzer: remove sysroot assertion X-Git-Tag: v6.18.9~27 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=ce798a0fe6b79560bed5363f1082da6fef2ea3df;p=thirdparty%2Fkernel%2Fstable.git scripts: generate_rust_analyzer: remove sysroot assertion commit 1b83ef9f7ad4635c913b80ef5e718f95f48e85af upstream. 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: Onur Özkan Reviewed-by: Gary Guo Fixes: fe992163575b ("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: Miguel Ojeda Signed-off-by: Greg Kroah-Hartman --- diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py index b0cab469af0af..be3933265c4dc 100755 --- a/scripts/generate_rust_analyzer.py +++ b/scripts/generate_rust_analyzer.py @@ -192,9 +192,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),