Skip to content

Commit 20f892f

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 f91c55e + 90aa66b commit 20f892f

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
@@ -367,7 +367,7 @@ impl Step for Openssl {
367367
if !ok {
368368
panic!("failed to download openssl source")
369369
}
370-
let mut shasum = if target.contains("apple") {
370+
let mut shasum = if target.contains("apple") || build.build.contains("netbsd") {
371371
let mut cmd = Command::new("shasum");
372372
cmd.arg("-a").arg("256");
373373
cmd
@@ -387,7 +387,7 @@ impl Step for Openssl {
387387
let dst = build.openssl_install_dir(target).unwrap();
388388
drop(fs::remove_dir_all(&obj));
389389
drop(fs::remove_dir_all(&dst));
390-
build.run(Command::new("tar").arg("xf").arg(&tarball).current_dir(&out));
390+
build.run(Command::new("tar").arg("zxf").arg(&tarball).current_dir(&out));
391391

392392
let mut configure = Command::new("perl");
393393
configure.arg(obj.join("Configure"));

0 commit comments

Comments
 (0)