mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use builder.sysroot(...) instead of a hack

Browse Source
This commit is contained in:
Maybe Waffle 2022-09-16 11:10:20 +04:00
parent 532e3a50eb
commit 9c3c88c945
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bootstrap/tool.rs
View File

@ -778,13 +778,9 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
source_type: SourceType::InTree, source_type: SourceType::InTree,
})?; })?;
// Copy `rust-analyzer-proc-macro-srv` to `build/triple/stageN/libexec/` // Copy `rust-analyzer-proc-macro-srv` to `<sysroot>/libexec/`
// so that r-a can use it. // so that r-a can use it.
let libexec_path = builder let libexec_path = builder.sysroot(self.compiler).join("libexec");
.out
.join(&*builder.config.build.triple)
.join(format!("stage{}", self.compiler.stage))
.join("libexec");
t!(fs::create_dir_all(&libexec_path)); t!(fs::create_dir_all(&libexec_path));
builder.copy(&path, &libexec_path.join("rust-analyzer-proc-macro-srv")); builder.copy(&path, &libexec_path.join("rust-analyzer-proc-macro-srv"));