Skip to content

Commit

Permalink
Auto merge of #48901 - alexcrichton:j1-install, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
rustbuild: Pass `-j1` to OpenSSL `make install`

We explicitly do this when compiling OpenSSL itself due to weird racy issues in
its build system, and now we've started seeing issues in the `make install` step
so let's try and see what ratcheting down the parallelism does here...
  • Loading branch information
bors committed Mar 10, 2018
2 parents 89115c0 + 3043723 commit 3edb3cc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ impl Step for Openssl {
println!("Building openssl for {}", target);
build.run_quiet(Command::new("make").arg("-j1").current_dir(&obj));
println!("Installing openssl for {}", target);
build.run_quiet(Command::new("make").arg("install").current_dir(&obj));
build.run_quiet(Command::new("make").arg("install").arg("-j1").current_dir(&obj));

let mut f = t!(File::create(&stamp));
t!(f.write_all(OPENSSL_VERS.as_bytes()));
Expand Down

0 comments on commit 3edb3cc

Please sign in to comment.