From bd392c88dfc7a24f4f03d71b9956466615277371 Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Sat, 27 Nov 2021 16:07:38 +0300 Subject: [PATCH] allow building any architecture when --no-framework is specified --- ios.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ios.sh b/ios.sh index db756e7..4e7b39f 100755 --- a/ios.sh +++ b/ios.sh @@ -173,19 +173,19 @@ disable_ios_architecture_not_supported_on_detected_sdk_version "${ARCH_ARM64_SIM # CHECK SOME RULES FOR .framework BUNDLES # 1. DISABLE arm64-mac-catalyst IN framework BUNDLES -if [[ -z ${FFMPEG_KIT_XCF_BUILD} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64_MAC_CATALYST}]} -eq 1 ]]; then +if [[ ${NO_FRAMEWORK} -ne 1 ]] && [[ -z ${FFMPEG_KIT_XCF_BUILD} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64_MAC_CATALYST}]} -eq 1 ]]; then echo -e "INFO: Disabled arm64-mac-catalyst architecture which cannot exist in a framework bundle.\n" 1>>"${BASEDIR}"/build.log 2>&1 disable_arch "arm64-mac-catalyst" fi # 2. DISABLE x86-64-mac-catalyst IN framework BUNDLES -if [[ -z ${FFMPEG_KIT_XCF_BUILD} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_X86_64_MAC_CATALYST}]} -eq 1 ]]; then +if [[ ${NO_FRAMEWORK} -ne 1 ]] && [[ -z ${FFMPEG_KIT_XCF_BUILD} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_X86_64_MAC_CATALYST}]} -eq 1 ]]; then echo -e "INFO: Disabled x86-64-mac-catalyst architecture which cannot exist in a framework bundle.\n" 1>>"${BASEDIR}"/build.log 2>&1 disable_arch "x86-64-mac-catalyst" fi # 3. DISABLE arm64-simulator WHEN arm64 IS ENABLED IN framework BUNDLES -if [[ -z ${FFMPEG_KIT_XCF_BUILD} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64}]} -eq 1 ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64_SIMULATOR}]} -eq 1 ]]; then +if [[ ${NO_FRAMEWORK} -ne 1 ]] && [[ -z ${FFMPEG_KIT_XCF_BUILD} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64}]} -eq 1 ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARM64_SIMULATOR}]} -eq 1 ]]; then echo -e "INFO: Disabled arm64-simulator architecture which cannot co-exist with arm64 in the same framework bundle.\n" 1>>"${BASEDIR}"/build.log 2>&1 disable_arch "arm64-simulator" fi