Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use llvm-ar, llvm-ranlib for Android NDK #983

Merged
merged 3 commits into from
Mar 2, 2024
Merged

Use llvm-ar, llvm-ranlib for Android NDK #983

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d00324
use llvm-ar, llvm-ranlib for Android NDK
mariotaku Feb 29, 2024
98dd8bd
Presence check of llvm-ar in Android NDK
mariotaku Mar 1, 2024
e97539e
Check return code for llvm tools presence
mariotaku Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3106,7 +3106,12 @@ impl Build {
Some(t) => t,
None => {
if target.contains("android") {
name = format!("{}-{}", target.replace("armv7", "arm"), tool);
let compiler = self.get_base_compiler()?;
if compiler.family == ToolFamily::Clang {
mariotaku marked this conversation as resolved.
Show resolved Hide resolved
name = format!("llvm-{}", tool);
} else {
name = format!("{}-{}", target.replace("armv7", "arm"), tool);
}
self.cmd(&name)
} else if target.contains("msvc") {
// NOTE: There isn't really a ranlib on msvc, so arguably we should return
Expand Down