diff options
| author | Ralf Jung <post@ralfj.de> | 2022-07-02 15:21:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-02 15:21:18 -0400 |
| commit | 283430dfb05d4eea376cd6137e36eda903dc68d9 (patch) | |
| tree | 2d027a0c725bfb61ea50df8cce4d5e9478afea18 | |
| parent | 9bf7355446c26447ddfd9fb124c01149f2d7e6ed (diff) | |
| parent | cec6933d0dd553322dcd5978fb418cb08347a868 (diff) | |
| download | rust-283430dfb05d4eea376cd6137e36eda903dc68d9.tar.gz rust-283430dfb05d4eea376cd6137e36eda903dc68d9.zip | |
Rollup merge of #98753 - jyn514:dist-rust-dev, r=Mark-Simulacrum
Fix `x dist rust-dev` on a fresh checkout Previously, it required you to manually run `x build` first, because it assumed the LLVM binaries were already present.
| -rw-r--r-- | src/bootstrap/dist.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 74ec9cab5ca..cd85654db01 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -2025,6 +2025,8 @@ impl Step for RustDev { let mut tarball = Tarball::new(builder, "rust-dev", &target.triple); tarball.set_overlay(OverlayKind::LLVM); + builder.ensure(crate::native::Llvm { target }); + let src_bindir = builder.llvm_out(target).join("bin"); // If updating this list, you likely want to change // src/bootstrap/download-ci-llvm-stamp as well, otherwise local users |