Skip to content

Commit ce798a0

Browse files
onur-ozkangregkh
authored andcommitted
scripts: generate_rust_analyzer: remove sysroot assertion
commit 1b83ef9 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 <work@onurozkan.dev> Reviewed-by: Gary Guo <gary@garyguo.net> Fixes: fe99216 ("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 <ojeda@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 595718c commit ce798a0

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

scripts/generate_rust_analyzer.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,6 @@ def main():
192192
level=logging.INFO if args.verbose else logging.WARNING
193193
)
194194

195-
# Making sure that the `sysroot` and `sysroot_src` belong to the same toolchain.
196-
assert args.sysroot in args.sysroot_src.parents
197-
198195
rust_project = {
199196
"crates": generate_crates(args.srctree, args.objtree, args.sysroot_src, args.exttree, args.cfgs, args.core_edition),
200197
"sysroot": str(args.sysroot),

0 commit comments

Comments
 (0)