diff options
| author | bors <bors@rust-lang.org> | 2022-04-18 09:58:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-18 09:58:22 +0000 |
| commit | 491f619f564a4ff9ae4cc837e27bb919d04c31be (patch) | |
| tree | 24291e97b41212b47e437159329638aeeecc1468 | |
| parent | faecdc05abc997ba3be693024724ce205facb686 (diff) | |
| parent | dcc3554c62d611ab5b9182f11a4954294832365b (diff) | |
| download | rust-491f619f564a4ff9ae4cc837e27bb919d04c31be.tar.gz rust-491f619f564a4ff9ae4cc837e27bb919d04c31be.zip | |
Auto merge of #96080 - nikic:ranlib, r=Mark-Simulacrum
Respect ranlib specified for target during LLVM build The ranlib specified for the target was never actually transferred into the builder configuration. In the dist-x86_64-linux build we ended up using ranlib instead of llvm-ranlib. Found this investigating a build failure in #94214.
| -rw-r--r-- | src/bootstrap/cc_detect.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs index 7ce44687611..dca782c29c2 100644 --- a/src/bootstrap/cc_detect.rs +++ b/src/bootstrap/cc_detect.rs @@ -149,6 +149,10 @@ pub fn find(build: &mut Build) { build.verbose(&format!("AR_{} = {:?}", &target.triple, ar)); build.ar.insert(target, ar); } + + if let Some(ranlib) = config.and_then(|c| c.ranlib.clone()) { + build.ranlib.insert(target, ranlib); + } } } |
