Skip to content

Commit fb45e7d

Browse files
authored
CirrusCI: Fix ranlib confusion between xcode and AndroidNDK (#5749)
* Use ar and ranlib from Android NDK rather than xcode
1 parent e41cb1a commit fb45e7d

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.cirrus.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,16 @@ task:
8989
type: text/plain
9090

9191
macos_instance:
92-
image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
92+
image: ghcr.io/cirruslabs/macos-tahoe-xcode:latest
9393
task:
9494
name: AppleM1/LLVM armv7-androidndk xbuild
9595
compile_script:
9696
- brew install --cask android-ndk
9797
- export ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk"
9898
- export CC=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi23-clang
99-
- make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 RANLIB="ls -l"
99+
- export AR=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar
100+
- export RANLIB=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib
101+
- make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1
100102
always:
101103
config_artifacts:
102104
path: "*conf*"

0 commit comments

Comments
 (0)