Adjust M1 crossbuilds after image autoupgrade and add an M1-to-Android crossbuild on Cirrus CI (#4117)
* Fix Apple crossbuilds after Cirrus updated the image; add a crossbuild to Android/ARMV7
This commit is contained in:
parent
2183dbcfe2
commit
4d0b7fbec0
37
.cirrus.yml
37
.cirrus.yml
|
@ -32,7 +32,7 @@ task:
|
||||||
- make
|
- make
|
||||||
|
|
||||||
macos_instance:
|
macos_instance:
|
||||||
image: ghcr.io/cirruslabs/macos-monterey-xcode:13.4
|
image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
|
||||||
task:
|
task:
|
||||||
name: AppleM1/LLVM x86_64 xbuild
|
name: AppleM1/LLVM x86_64 xbuild
|
||||||
compile_script:
|
compile_script:
|
||||||
|
@ -47,10 +47,11 @@ task:
|
||||||
- export ARCHS_STANDARD_INCLUDING_64_BIT="i386 x86_64"
|
- export ARCHS_STANDARD_INCLUDING_64_BIT="i386 x86_64"
|
||||||
- export ARCHS_UNIVERSAL_IPHONE_OS="i386 x86_64"
|
- export ARCHS_UNIVERSAL_IPHONE_OS="i386 x86_64"
|
||||||
- export VALID_ARCHS="i386 x86_64"
|
- export VALID_ARCHS="i386 x86_64"
|
||||||
- #find /Applications/Xcode-13.4.1.app -name libunwind.dylib
|
- xcrun --sdk macosx --show-sdk-path
|
||||||
- export CC=/Applications/Xcode-13.4.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
|
- xcodebuild -version
|
||||||
- export CFLAGS="-O2 -unwindlib=none -Wno-macro-redefined -isysroot /Applications/Xcode-13.4.1.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator15.5.sdk -arch x86_64 -miphoneos-version-min=10.0"
|
- export CC=/Applications/Xcode-14.0.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
|
||||||
- make TARGET=CORE2 DYNAMIC_ARCH=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1
|
- export CFLAGS="-O2 -unwindlib=none -Wno-macro-redefined -isysroot /Applications/Xcode-14.0.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk -arch x86_64"
|
||||||
|
- make TARGET=CORE2 DYNAMIC_ARCH=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 RANLIB="ls -l"
|
||||||
always:
|
always:
|
||||||
config_artifacts:
|
config_artifacts:
|
||||||
path: "*conf*"
|
path: "*conf*"
|
||||||
|
@ -60,7 +61,7 @@ task:
|
||||||
# type: application/octet-streamm
|
# type: application/octet-streamm
|
||||||
|
|
||||||
macos_instance:
|
macos_instance:
|
||||||
image: ghcr.io/cirruslabs/macos-monterey-xcode:13.4
|
image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
|
||||||
task:
|
task:
|
||||||
name: AppleM1/LLVM armv8-ios xbuild
|
name: AppleM1/LLVM armv8-ios xbuild
|
||||||
compile_script:
|
compile_script:
|
||||||
|
@ -68,15 +69,33 @@ task:
|
||||||
- export #PATH=/opt/homebrew/opt/llvm/bin:$PATH
|
- export #PATH=/opt/homebrew/opt/llvm/bin:$PATH
|
||||||
- export #LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
|
- export #LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
|
||||||
- export #CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
|
- export #CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
|
||||||
- find /Applications/Xcode-13.4.1.app/Contents/Developer/Platforms -name "IPhoneOS*sdk"
|
- export CC=/Applications/Xcode-14.0.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
|
||||||
- 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-14.0.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.0.sdk -arch arm64 -miphoneos-version-min=10.0"
|
||||||
- export CFLAGS="-O2 -unwindlib=none -Wno-macro-redefined -isysroot /Applications/Xcode-13.4.1.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS15.5.sdk -arch arm64 -miphoneos-version-min=10.0"
|
|
||||||
- make TARGET=ARMV8 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 CROSS=1
|
- make TARGET=ARMV8 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 CROSS=1
|
||||||
always:
|
always:
|
||||||
config_artifacts:
|
config_artifacts:
|
||||||
path: "*conf*"
|
path: "*conf*"
|
||||||
type: text/plain
|
type: text/plain
|
||||||
|
|
||||||
|
macos_instance:
|
||||||
|
image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
|
||||||
|
task:
|
||||||
|
name: AppleM1/LLVM armv7-androidndk xbuild
|
||||||
|
compile_script:
|
||||||
|
- #brew install 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"
|
||||||
|
- find /System/Volumes/Data/opt/homebrew/Caskroom/android-ndk/25b -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/25b/AndroidNDK8937393.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:
|
||||||
|
path: "*conf*"
|
||||||
|
type: text/plain
|
||||||
|
|
||||||
task:
|
task:
|
||||||
name: NeoverseN1
|
name: NeoverseN1
|
||||||
arm_container:
|
arm_container:
|
||||||
|
|
Loading…
Reference in New Issue