Skip to content

Commit a660f0c

Browse files
Rollup merge of rust-lang#44320 - jakllsch:jakllsch-caf2c3d2-c939-4c4d-8c68-1aecbd570fab, r=Mark-Simulacrum
Fix extended bootstrap issues with OpenSSL on NetBSD build hosts
2 parents a784c33 + ab89870 commit a660f0c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/bootstrap/native.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ impl Step for Openssl {
366366
if !ok {
367367
panic!("failed to download openssl source")
368368
}
369-
let mut shasum = if target.contains("apple") {
369+
let mut shasum = if target.contains("apple") || build.build.contains("netbsd") {
370370
let mut cmd = Command::new("shasum");
371371
cmd.arg("-a").arg("256");
372372
cmd
@@ -386,7 +386,7 @@ impl Step for Openssl {
386386
let dst = build.openssl_install_dir(target).unwrap();
387387
drop(fs::remove_dir_all(&obj));
388388
drop(fs::remove_dir_all(&dst));
389-
build.run(Command::new("tar").arg("xf").arg(&tarball).current_dir(&out));
389+
build.run(Command::new("tar").arg("zxf").arg(&tarball).current_dir(&out));
390390

391391
let mut configure = Command::new(obj.join("Configure"));
392392
configure.arg(format!("--prefix={}", dst.display()));

0 commit comments

Comments
 (0)