nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 03:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try Mode::ToolRustc

Browse Source
This commit is contained in:
Laurențiu Nicola 2023-11-13 15:27:44 +02:00
parent 01422d1704
commit 636a6f70b6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bootstrap/src/core/build_steps/check.rs
View File

@ -376,12 +376,12 @@ impl Step for RustAnalyzer {
let compiler = builder.compiler(builder.top_stage, builder.config.build); let compiler = builder.compiler(builder.top_stage, builder.config.build);
let target = self.target; let target = self.target;
builder.ensure(Std::new(target)); builder.ensure(Rustc::new(target, builder));
let mut cargo = prepare_tool_cargo( let mut cargo = prepare_tool_cargo(
builder, builder,
compiler, compiler,
Mode::ToolStd, Mode::ToolRustc,
target, target,
cargo_subcommand(builder.kind), cargo_subcommand(builder.kind),
"src/tools/rust-analyzer", "src/tools/rust-analyzer",
@ -414,7 +414,7 @@ impl Step for RustAnalyzer {
/// Cargo's output path in a given stage, compiled by a particular /// Cargo's output path in a given stage, compiled by a particular
/// compiler for the specified target. /// compiler for the specified target.
fn stamp(builder: &Builder<'_>, compiler: Compiler, target: TargetSelection) -> PathBuf { fn stamp(builder: &Builder<'_>, compiler: Compiler, target: TargetSelection) -> PathBuf {
builder.cargo_out(compiler, Mode::ToolStd, target).join(".rust-analyzer-check.stamp") builder.cargo_out(compiler, Mode::ToolRustc, target).join(".rust-analyzer-check.stamp")
} }
} }
} }

4
src/bootstrap/src/core/build_steps/test.rs
View File

@ -369,7 +369,7 @@ impl Step for RustAnalyzer {
// We don't need to build the whole Rust Analyzer for the proc-macro-srv test suite, // We don't need to build the whole Rust Analyzer for the proc-macro-srv test suite,
// but we do need the standard library to be present. // but we do need the standard library to be present.
builder.ensure(compile::Std::new(compiler, host)); builder.ensure(compile::Rustc::new(compiler, host));
let workspace_path = "src/tools/rust-analyzer"; let workspace_path = "src/tools/rust-analyzer";
// until the whole RA test suite runs on `i686`, we only run // until the whole RA test suite runs on `i686`, we only run
@ -378,7 +378,7 @@ impl Step for RustAnalyzer {
let mut cargo = tool::prepare_tool_cargo( let mut cargo = tool::prepare_tool_cargo(
builder, builder,
compiler, compiler,
Mode::ToolStd, Mode::ToolRustc,
host, host,
"test", "test",
crate_path, crate_path,

2
src/bootstrap/src/core/build_steps/tool.rs
View File

@ -635,7 +635,7 @@ impl Step for RustAnalyzer {
compiler: self.compiler, compiler: self.compiler,
target: self.target, target: self.target,
tool: "rust-analyzer", tool: "rust-analyzer",
mode: Mode::ToolStd, mode: Mode::ToolRustc,
path: "src/tools/rust-analyzer", path: "src/tools/rust-analyzer",
extra_features: vec!["rust-analyzer/in-rust-tree".to_owned()], extra_features: vec!["rust-analyzer/in-rust-tree".to_owned()],
is_optional_tool: false, is_optional_tool: false,