Skip to content

Commit

Permalink
Rollup merge of #80434 - pietroalbini:tarball-temp-dir, r=Mark-Simula…
Browse files Browse the repository at this point in the history
…crum

bootstrap: put the component name in the tarball temp dir path

This should not matter right now, but if we ever parallelize rustbuild this will avoid tarball contents being merged together.

r? `@Mark-Simulacrum`
  • Loading branch information
Dylan-DPC authored Dec 28, 2020
2 parents 80934ab + f994f1e commit a4a59a0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/tarball.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ impl<'a> Tarball<'a> {
fn new_inner(builder: &'a Builder<'a>, component: &str, target: Option<String>) -> Self {
let pkgname = crate::dist::pkgname(builder, component);

let mut temp_dir = builder.out.join("tmp").join("tarball");
let mut temp_dir = builder.out.join("tmp").join("tarball").join(component);
if let Some(target) = &target {
temp_dir = temp_dir.join(target);
}
Expand Down

0 comments on commit a4a59a0

Please sign in to comment.