Skip to content

Commit

Permalink
Auto merge of #96207 - nikic:distcheck-dir, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Ensure existance of dist directory when creating tarball

I'm not sure why this works in CI, but this is necessary to make distcheck (including the `x86_64-linux-distcheck` image) run on Fedora 35.
  • Loading branch information
bors committed Apr 22, 2022
2 parents 1158ade + b914678 commit 8d68f2f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/bootstrap/tarball.rs
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,13 @@ impl<'a> Tarball<'a> {
t!(std::fs::rename(&self.image_dir, &dest));

self.run(|this, cmd| {
let distdir = crate::dist::distdir(this.builder);
t!(std::fs::create_dir_all(&distdir));
cmd.arg("tarball")
.arg("--input")
.arg(&dest)
.arg("--output")
.arg(crate::dist::distdir(this.builder).join(this.package_name()));
.arg(distdir.join(this.package_name()));
})
}

Expand Down

0 comments on commit 8d68f2f

Please sign in to comment.