about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2022-04-15 16:51:09 +0200
committerNikita Popov <nikita.ppv@gmail.com>2022-04-15 16:51:09 +0200
commitdcc3554c62d611ab5b9182f11a4954294832365b (patch)
treedf9c8af06caf0daf2b227d742bbec5da85bdfe9c /src
parent461e8078010433ff7de2db2aaae8a3cfb0847215 (diff)
downloadrust-dcc3554c62d611ab5b9182f11a4954294832365b.tar.gz
rust-dcc3554c62d611ab5b9182f11a4954294832365b.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/cc_detect.rs4
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);
+        }
     }
 }