Auto merge of #140006 - onur-ozkan:138778, r= · rust-lang/rust@927bf00 (original) (raw)

`@@ -421,13 +421,13 @@ impl Step for Rustc {

`

421

421

` builder.install(&rustdoc, &image.join("bin"), FileType::Executable);

`

422

422

`}

`

423

423

``

``

424

`+

let ra_proc_macro_srv_compiler =

`

``

425

`+

builder.compiler_for(compiler.stage, builder.config.build, compiler.host);

`

``

426

`+

builder.ensure(compile::Rustc::new(ra_proc_macro_srv_compiler, compiler.host));

`

``

427

+

424

428

`if let Some(ra_proc_macro_srv) = builder.ensure_if_default(

`

425

429

` tool::RustAnalyzerProcMacroSrv {

`

426

``

`-

compiler: builder.compiler_for(

`

427

``

`-

compiler.stage,

`

428

``

`-

builder.config.build,

`

429

``

`-

compiler.host,

`

430

``

`-

),

`

``

430

`+

compiler: ra_proc_macro_srv_compiler,

`

431

431

`target: compiler.host,

`

432

432

`},

`

433

433

` builder.kind,

`

`@@ -1178,6 +1178,8 @@ impl Step for Cargo {

`

1178

1178

`let compiler = self.compiler;

`

1179

1179

`let target = self.target;

`

1180

1180

``

``

1181

`+

builder.ensure(compile::Rustc::new(compiler, target));

`

``

1182

+

1181

1183

`let cargo = builder.ensure(tool::Cargo { compiler, target });

`

1182

1184

`let src = builder.src.join("src/tools/cargo");

`

1183

1185

`let etc = src.join("src/etc");

`

`@@ -1232,6 +1234,8 @@ impl Step for RustAnalyzer {

`

1232

1234

`let compiler = self.compiler;

`

1233

1235

`let target = self.target;

`

1234

1236

``

``

1237

`+

builder.ensure(compile::Rustc::new(compiler, target));

`

``

1238

+

1235

1239

`let rust_analyzer = builder.ensure(tool::RustAnalyzer { compiler, target });

`

1236

1240

``

1237

1241

`let mut tarball = Tarball::new(builder, "rust-analyzer", &target.triple);

`

`@@ -1274,6 +1278,8 @@ impl Step for Clippy {

`

1274

1278

`let compiler = self.compiler;

`

1275

1279

`let target = self.target;

`

1276

1280

``

``

1281

`+

builder.ensure(compile::Rustc::new(compiler, target));

`

``

1282

+

1277

1283

`// Prepare the image directory

`

1278

1284

`// We expect clippy to build, because we've exited this step above if tool

`

1279

1285

`// state for clippy isn't testing.

`

`@@ -1324,9 +1330,12 @@ impl Step for Miri {

`

1324

1330

`if !builder.build.unstable_features() {

`

1325

1331

`return None;

`

1326

1332

`}

`

``

1333

+

1327

1334

`let compiler = self.compiler;

`

1328

1335

`let target = self.target;

`

1329

1336

``

``

1337

`+

builder.ensure(compile::Rustc::new(compiler, target));

`

``

1338

+

1330

1339

`let miri = builder.ensure(tool::Miri { compiler, target });

`

1331

1340

`let cargomiri = builder.ensure(tool::CargoMiri { compiler, target });

`

1332

1341

``

`@@ -1463,6 +1472,8 @@ impl Step for Rustfmt {

`

1463

1472

`let compiler = self.compiler;

`

1464

1473

`let target = self.target;

`

1465

1474

``

``

1475

`+

builder.ensure(compile::Rustc::new(compiler, target));

`

``

1476

+

1466

1477

`let rustfmt = builder.ensure(tool::Rustfmt { compiler, target });

`

1467

1478

`let cargofmt = builder.ensure(tool::Cargofmt { compiler, target });

`

1468

1479

`let mut tarball = Tarball::new(builder, "rustfmt", &target.triple);

`

`@@ -2328,6 +2339,8 @@ impl Step for LlvmBitcodeLinker {

`

2328

2339

`let compiler = self.compiler;

`

2329

2340

`let target = self.target;

`

2330

2341

``

``

2342

`+

builder.ensure(compile::Rustc::new(compiler, target));

`

``

2343

+

2331

2344

`let llbc_linker =

`

2332

2345

` builder.ensure(tool::LlvmBitcodeLinker { compiler, target, extra_features: vec![] });

`

2333

2346

``