From f43f21275d1e6e3d619b8c3f105d89f032784cc9 Mon Sep 17 00:00:00 2001
From: min <minish@riseup.net>
Date: Wed, 26 Nov 2025 02:08:23 -0500
Subject: [PATCH] fix: prioritise llvm tools

---
 boring-sys/build/main.rs   | 2 +-
 boring-sys/build/prefix.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boring-sys/build/main.rs b/boring-sys/build/main.rs
index b0f4bd87..09d0bc66 100644
--- a/boring-sys/build/main.rs
+++ b/boring-sys/build/main.rs
@@ -637,7 +637,7 @@ fn link_in_precompiled_bcm_o(config: &Config) {
     fs::copy(bcm_o_src_path, &bcm_o_dst_path).unwrap();
 
     // check that fips module is named as expected
-    let ar = &["ar", "llvm-ar"];
+    let ar = &["llvm-ar", "ar"];
     let out = run_command(ar, |c| c.arg("t").arg(&libcrypto_path).arg("bcm.o")).unwrap();
 
     assert_eq!(
diff --git a/boring-sys/build/prefix.rs b/boring-sys/build/prefix.rs
index c318b9f1..f68443be 100644
--- a/boring-sys/build/prefix.rs
+++ b/boring-sys/build/prefix.rs
@@ -61,7 +61,7 @@ pub fn prefix_symbols(config: &Config) {
     // Use `nm` to list symbols in these static libraries
     let nm: &[PathBuf] = match &*config.target_os {
         "android" => &[android_toolchain(config).join("llvm-nm")],
-        _ => &[PathBuf::from("nm"), PathBuf::from("llvm-nm")],
+        _ => &[PathBuf::from("llvm-nm"), PathBuf::from("nm")],
     };
     let out = run_command(nm, |c| c.args(&static_libs)).unwrap();
     let mut redefine_syms: Vec<String> = String::from_utf8_lossy(&out.stdout)
@@ -89,7 +89,7 @@ pub fn prefix_symbols(config: &Config) {
     // Use `objcopy` to prefix symbols in these static libraries
     let objcopy: &[PathBuf] = match &*config.target_os {
         "android" => &[android_toolchain(config).join("llvm-objcopy")],
-        _ => &[PathBuf::from("objcopy"), PathBuf::from("llvm-objcopy")],
+        _ => &[PathBuf::from("llvm-objcopy"), PathBuf::from("objcopy")],
     };
     for static_lib in &static_libs {
         run_command(objcopy, |c| {