History

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.

Onur Özkan committed 10 months ago

Commit 1b83ef91 parent af20ae31 file · +0 −3Browse files

Showing the changes to scripts (1 of 1 file). Show all

Unified · Split

scripts/generate_rust_analyzer.py+0−3
@@ -213,9 +213,6 @@ def main(): · 212 unmodified lines
213 level=logging.INFO if args.verbose else logging.WARNING213 level=logging.INFO if args.verbose else logging.WARNING
214 )214 )
215 215
216 # Making sure that the `sysroot` and `sysroot_src` belong to the same toolchain.
217 assert args.sysroot in args.sysroot_src.parents
218
219 rust_project = {216 rust_project = {
220 "crates": generate_crates(args.srctree, args.objtree, args.sysroot_src, args.exttree, args.cfgs, args.core_edition),217 "crates": generate_crates(args.srctree, args.objtree, args.sysroot_src, args.exttree, args.cfgs, args.core_edition),
221 "sysroot": str(args.sysroot),218 "sysroot": str(args.sysroot),

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t