Skip to content

Commit

Permalink
Auto merge of rust-lang#96080 - nikic:ranlib, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Apr 18, 2022
2 parents faecdc0 + dcc3554 commit 491f619
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/bootstrap/cc_detect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}

Expand Down

0 comments on commit 491f619

Please sign in to comment.