Skip to content

Commit 2c5361a

Browse files
Rollup merge of rust-lang#141568 - onur-ozkan:141393-fix, r=Kobzol
dist: make sure llvm-project submodule is present Zero-config `x install` fails when bootstrap tries to copy files from the LLVM submodule because it's not properly initialized/handled. This diff handles that. Fixes rust-lang#141393
2 parents 7acdffb + b71a127 commit 2c5361a

File tree

1 file changed

+8
-0
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+8
-0
lines changed

src/bootstrap/src/core/build_steps/dist.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2282,6 +2282,10 @@ impl Step for LlvmTools {
22822282
}
22832283
}
22842284

2285+
if !builder.config.dry_run() {
2286+
builder.require_submodule("src/llvm-project", None);
2287+
}
2288+
22852289
builder.ensure(crate::core::build_steps::llvm::Llvm { target });
22862290

22872291
let mut tarball = Tarball::new(builder, "llvm-tools", &target.triple);
@@ -2400,6 +2404,10 @@ impl Step for RustDev {
24002404
}
24012405
}
24022406

2407+
if !builder.config.dry_run() {
2408+
builder.require_submodule("src/llvm-project", None);
2409+
}
2410+
24032411
let mut tarball = Tarball::new(builder, "rust-dev", &target.triple);
24042412
tarball.set_overlay(OverlayKind::Llvm);
24052413
// LLVM requires a shared object symlink to exist on some platforms.

0 commit comments

Comments
 (0)