at master 1.1 kB view raw
1CMake tries to read a list field from SDKSettings.plist, but the output of 2xcbuild PlistBuddy is incompatible with Apple's. (Plus we don't want it in our 3dependencies.) 4 5Simply assume ARM64 is supported by the SDK. We already limit the actual archs 6we build for by setting DARWIN_osx_BUILTIN_ARCHS explicitely. 7 8--- a/cmake/builtin-config-ix.cmake 9+++ b/cmake/builtin-config-ix.cmake 10@@ -97,14 +97,7 @@ if(APPLE) 11 set(DARWIN_osx_BUILTIN_MIN_VER 10.5) 12 set(DARWIN_osx_BUILTIN_MIN_VER_FLAG 13 -mmacosx-version-min=${DARWIN_osx_BUILTIN_MIN_VER}) 14- set(DARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS ${X86} ${X86_64}) 15- # Add support for arm64 macOS if available in SDK. 16- foreach(arch ${ARM64}) 17- sdk_has_arch_support(${DARWIN_osx_SYSROOT} macosx ${arch} MACOS_ARM_SUPPORT) 18- if (MACOS_ARM_SUPPORT) 19- list(APPEND DARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS ${arch}) 20- endif() 21- endforeach(arch) 22+ set(DARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS ${X86} ${X86_64} ${ARM64}) 23 24 if(COMPILER_RT_ENABLE_IOS) 25 list(APPEND DARWIN_EMBEDDED_PLATFORMS ios)