Skip to content

Commit 491f619

Browse files
committed
Auto merge of rust-lang#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 rust-lang#94214.
2 parents faecdc0 + dcc3554 commit 491f619

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/bootstrap/cc_detect.rs

+4
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,10 @@ pub fn find(build: &mut Build) {
149149
build.verbose(&format!("AR_{} = {:?}", &target.triple, ar));
150150
build.ar.insert(target, ar);
151151
}
152+
153+
if let Some(ranlib) = config.and_then(|c| c.ranlib.clone()) {
154+
build.ranlib.insert(target, ranlib);
155+
}
152156
}
153157
}
154158

0 commit comments

Comments
 (0)