diff --git a/build-libssl.sh b/build-libssl.sh index 396b693..71e1b6c 100755 --- a/build-libssl.sh +++ b/build-libssl.sh @@ -60,7 +60,6 @@ echo_help() echo " Note: The framework will contain include files from the architecture listed first" echo echo "Options for OpenSSL 1.1.0 and higher ONLY" - echo " --async Exclude no-async configure option and build with async support - do not use if submitting to App Store" echo " --deprecated Exclude no-deprecated configure option and build with deprecated methods" echo " --targets=\"TARGET TARGET ...\" Space-separated list of build targets" echo " Options: ${DEFAULTTARGETS}" @@ -185,7 +184,6 @@ ARCHS="" BRANCH="" CLEANUP="" CONFIG_ENABLE_EC_NISTP_64_GCC_128="" -CONFIG_NO_ASYNC="" CONFIG_NO_DEPRECATED="" IOS_SDKVERSION="" LOG_VERBOSE="" @@ -202,9 +200,6 @@ case $i in ARCHS="${i#*=}" shift ;; - --async) - CONFIG_NO_ASYNC="false" - ;; --branch=*) BRANCH="${i#*=}" shift @@ -315,11 +310,6 @@ else TARGETS="${DEFAULTTARGETS}" fi - # Add no-async config option (if not overwritten) - async being enabled leads to App Store rejection - if [ "${CONFIG_NO_ASYNC}" != "false" ]; then - CONFIG_OPTIONS="${CONFIG_OPTIONS} no-async" - fi - # Add no-deprecated config option (if not overwritten) if [ "${CONFIG_NO_DEPRECATED}" != "false" ]; then CONFIG_OPTIONS="${CONFIG_OPTIONS} no-deprecated" diff --git a/scripts/build-loop-targets.sh b/scripts/build-loop-targets.sh index cc72692..ca3c5c7 100755 --- a/scripts/build-loop-targets.sh +++ b/scripts/build-loop-targets.sh @@ -56,8 +56,10 @@ do prepare_target_source_dirs ## Determine config options - # Add build target, --prefix and prevent creation of shared libraries (default since 1.1.0) - LOCAL_CONFIG_OPTIONS="${TARGET} --prefix=${TARGETDIR} ${CONFIG_OPTIONS} no-shared" + # Add build target, --prefix and prevent async (references to getcontext(), + # setcontext() and makecontext() result in App Store rejections) and creation + # of shared libraries (default since 1.1.0) + LOCAL_CONFIG_OPTIONS="${TARGET} --prefix=${TARGETDIR} ${CONFIG_OPTIONS} no-async no-shared" # Only relevant for 64 bit builds if [[ "${CONFIG_ENABLE_EC_NISTP_64_GCC_128}" == "true" && "${ARCH}" == *64 ]]; then