Skip to content

Commit

Permalink
Rollup merge of rust-lang#44320 - jakllsch:jakllsch-caf2c3d2-c939-4c4…
Browse files Browse the repository at this point in the history
…d-8c68-1aecbd570fab, r=Mark-Simulacrum

Fix extended bootstrap issues with OpenSSL on NetBSD build hosts
  • Loading branch information
Mark-Simulacrum authored Sep 6, 2017
2 parents a784c33 + ab89870 commit a660f0c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/bootstrap/native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ impl Step for Openssl {
if !ok {
panic!("failed to download openssl source")
}
let mut shasum = if target.contains("apple") {
let mut shasum = if target.contains("apple") || build.build.contains("netbsd") {
let mut cmd = Command::new("shasum");
cmd.arg("-a").arg("256");
cmd
Expand All @@ -386,7 +386,7 @@ impl Step for Openssl {
let dst = build.openssl_install_dir(target).unwrap();
drop(fs::remove_dir_all(&obj));
drop(fs::remove_dir_all(&dst));
build.run(Command::new("tar").arg("xf").arg(&tarball).current_dir(&out));
build.run(Command::new("tar").arg("zxf").arg(&tarball).current_dir(&out));

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

0 comments on commit a660f0c

Please sign in to comment.