diff options
| author | bors <bors@rust-lang.org> | 2017-04-26 21:26:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-26 21:26:14 +0000 |
| commit | 612847bf7171403022f8b4f1df1b87e377dcf01c (patch) | |
| tree | 57464197ca23e8d6842ca346b51c65633217fc4c /src/rustllvm/RustWrapper.cpp | |
| parent | 036983201d4e9aeb5c5e56e47c305971972b2569 (diff) | |
| parent | 367e90775beb90e3795209dab29b428b639521cf (diff) | |
| download | rust-612847bf7171403022f8b4f1df1b87e377dcf01c.tar.gz rust-612847bf7171403022f8b4f1df1b87e377dcf01c.zip | |
Auto merge of #41563 - aidanhs:aphs-fix-spurious-osx-openssl-failure, r=alexcrichton
Make sure openssl compiles with only one core This is (hopefully) a fix for the osx openssl spurious failure - #40417. The intermittent failures and failing in different ways made me think of a race condition. But programs are parallel make safe right? [Not openssl](https://github.com/openssl/openssl/issues/298). But we don't do a parallel make on openssl [do we](https://github.com/rust-lang/rust/blob/8c4f2c64c6759a82f143e23964a46a65c67509c9/src/bootstrap/native.rs#L309)? This confused me, except "Waiting for unfinished jobs" is present in the logs...which is evidence of a parallel make! It turns out that when we invoke to top level target [in run.sh](https://github.com/rust-lang/rust/blob/036983201d4e9aeb5c5e56e47c305971972b2569/src/ci/run.sh#L75-L77), make will [pass the flags downwards](https://www.gnu.org/software/make/manual/html_node/Options_002fRecursion.html) in order to take advantage of parallelism in sub-makes. Of course, we don't want this in openssl! Override this by explicitly disabling parallelism on the command line. I don't know why this hasn't happened on anything except OSX. Maybe Linux binutils check if the file is in use? r? @alexcrichton
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions