Skip to content

Commit 9c3c88c

Browse files
committedSep 16, 2022
Use builder.sysroot(...) instead of a hack
1 parent 532e3a5 commit 9c3c88c

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed
 

‎src/bootstrap/tool.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -778,13 +778,9 @@ impl Step for RustAnalyzerProcMacroSrv {
778778
source_type: SourceType::InTree,
779779
})?;
780780

781-
// Copy `rust-analyzer-proc-macro-srv` to `build/triple/stageN/libexec/`
781+
// Copy `rust-analyzer-proc-macro-srv` to `<sysroot>/libexec/`
782782
// so that r-a can use it.
783-
let libexec_path = builder
784-
.out
785-
.join(&*builder.config.build.triple)
786-
.join(format!("stage{}", self.compiler.stage))
787-
.join("libexec");
783+
let libexec_path = builder.sysroot(self.compiler).join("libexec");
788784
t!(fs::create_dir_all(&libexec_path));
789785
builder.copy(&path, &libexec_path.join("rust-analyzer-proc-macro-srv"));
790786

0 commit comments

Comments
 (0)
Please sign in to comment.