bootstrap: extract from any compression algorithm during distcheck

This commit is contained in:
Pietro Albini 2020-12-30 16:05:57 +01:00
parent d0d0ee0b5d
commit 5526d90250
No known key found for this signature in database
GPG Key ID: 3E06ABE80BAAF19C

View File

@ -1968,7 +1968,7 @@ impl Step for Distcheck {
builder.ensure(dist::Src);
let mut cmd = Command::new("tar");
cmd.arg("-xzf")
cmd.arg("-xf")
.arg(builder.ensure(dist::PlainSourceTarball))
.arg("--strip-components=1")
.current_dir(&dir);
@ -1992,10 +1992,7 @@ impl Step for Distcheck {
t!(fs::create_dir_all(&dir));
let mut cmd = Command::new("tar");
cmd.arg("-xzf")
.arg(builder.ensure(dist::Src))
.arg("--strip-components=1")
.current_dir(&dir);
cmd.arg("-xf").arg(builder.ensure(dist::Src)).arg("--strip-components=1").current_dir(&dir);
builder.run(&mut cmd);
let toml = dir.join("rust-src/lib/rustlib/src/rust/library/std/Cargo.toml");