From fb45e7da89f512edbb5ae3a237d535b0d724a7e1 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Wed, 8 Apr 2026 00:34:18 +0200
Subject: [PATCH] CirrusCI: Fix ranlib confusion between xcode and AndroidNDK
 (#5749)

* Use ar and ranlib from Android NDK rather than xcode
---
 .cirrus.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index bc7fbdf77..7481d4bfd 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -89,14 +89,16 @@ task:
       type: text/plain
 
 macos_instance:
-  image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
+  image: ghcr.io/cirruslabs/macos-tahoe-xcode:latest
 task:
   name: AppleM1/LLVM armv7-androidndk xbuild
   compile_script:
   - brew install --cask android-ndk
   - export ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk"
   - export CC=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi23-clang
-  - make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 RANLIB="ls -l"
+  - export AR=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar
+  - export RANLIB=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib
+  - make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1
   always:
     config_artifacts:
       path: "*conf*"