Rollup merge of #93080 - SkiFire13:itermut-as_mut_slice, r=m-ou-se

[rust.git] / src / bootstrap / cc_detect.rs

diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs
index 8c47f625d732bc3868c5018828d9371f0626435f..dca782c29c252f72ac6087787ac559541ff28cd2 100644 (file)
--- a/src/bootstrap/cc_detect.rs
+++ b/src/bootstrap/cc_detect.rs
@@ -26,9 +26,8 @@
 use std::process::Command;
 use std::{env, iter};
 
-use build_helper::output;
-
 use crate::config::{Target, TargetSelection};
+use crate::util::output;
 use crate::{Build, CLang, GitRepo};
 
 // The `cc` crate doesn't provide a way to obtain a path to the detected archiver,
@@ -150,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);
+        }
     }
 }