about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2018-03-09 18:49:28 -0800
committerAlex Crichton <alex@alexcrichton.com>2018-03-09 18:49:28 -0800
commit30437237a877cefe5a7287d16263f6c98adb4792 (patch)
treeefdc318f7fb98f36a5bb87d680f424e87000227a
parent89115c098f160fa784f60c6f8d01d2b7658c08cb (diff)
downloadrust-30437237a877cefe5a7287d16263f6c98adb4792.tar.gz
rust-30437237a877cefe5a7287d16263f6c98adb4792.zip
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...
-rw-r--r--src/bootstrap/native.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index 52bf1feaa6c..f923ad46bcb 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -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()));