Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -310,20 +310,20 @@ impl Build {
if target.contains("msvc") {
let mut build =
cc::windows_registry::find(target, "nmake.exe").expect("failed to find nmake");
build.current_dir(&inner_dir);
build.arg("build_libs").current_dir(&inner_dir);
self.run_command(build, "building OpenSSL");

let mut install =
cc::windows_registry::find(target, "nmake.exe").expect("failed to find nmake");
install.arg("install_sw").current_dir(&inner_dir);
install.arg("install_dev").current_dir(&inner_dir);
self.run_command(install, "installing OpenSSL");
} else {
let mut depend = self.cmd_make();
depend.arg("depend").current_dir(&inner_dir);
self.run_command(depend, "building OpenSSL dependencies");

let mut build = self.cmd_make();
build.current_dir(&inner_dir);
build.arg("build_libs").current_dir(&inner_dir);
if !cfg!(windows) {
if let Some(s) = env::var_os("CARGO_MAKEFLAGS") {
build.env("MAKEFLAGS", s);
Expand All @@ -339,7 +339,7 @@ impl Build {
self.run_command(build, "building OpenSSL");

let mut install = self.cmd_make();
install.arg("install_sw").current_dir(&inner_dir);
install.arg("install_dev").current_dir(&inner_dir);
self.run_command(install, "installing OpenSSL");
}

Expand Down