diff --git a/.cirrus.yml b/.cirrus.yml index 9c11ef1dd7..6a4a80b01a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -94,17 +94,10 @@ task: name: AppleM1/LLVM armv7-androidndk xbuild compile_script: - brew install --cask android-ndk - - export #PATH=/opt/homebrew/opt/llvm/bin:$PATH - - export #LDFLAGS="-L/opt/homebrew/opt/llvm/lib" - - export #CPPFLAGS="-I/opt/homebrew/opt/llvm/include" - - export ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" - - ls /Users/admin/android-sdk - - ls /Users/admin/android-ndk - - ls -l /System/Volumes/Data/opt/homebrew/Caskroom/android-ndk + - export ANDROID_NDK_HOME="/Users/admin/android-sdk/ndk" + - ls /Users/admin/android-sdk/ndk - find /opt/homebrew -name "armv7a-linux-androideabi*-ranlib" - - #export CC=/Applications/Xcode-13.4.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang - - #export CFLAGS="-O2 -unwindlib=none -Wno-macro-redefined -isysroot /Applications/Xcode-13.4.1.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.0.sdk -arch arm64 -miphoneos-version-min=10.0" - - export CC=/System/Volumes/Data/opt/homebrew/Caskroom/android-ndk/27/AndroidNDK*.app/Contents/NDK/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi23-clang + - export CC=/Users/admin/android-sdk/ndk/27/AndroidNDK*.app/Contents/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" always: config_artifacts: