From 3f826877c12531578a1fe885cbab572a36358b4a Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Fri, 13 Nov 2020 23:46:49 +0100 Subject: [PATCH] Skip lipo -create for static libs Can't merge same arch for multiple platforms (e.g. iPhone Simulator arm64 and iOS arm64). Also not needed for frameworks creation, which is the primary goal of the scripts. --- build-libssl.sh | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/build-libssl.sh b/build-libssl.sh index 183f9fd..9422b4a 100755 --- a/build-libssl.sh +++ b/build-libssl.sh @@ -525,41 +525,6 @@ LIBCRYPTO_TVOS=() source "${SCRIPTDIR}/scripts/build-loop-targets.sh" -# Build iOS library if selected for build -if [ ${#LIBSSL_IOS[@]} -gt 0 ]; then - echo "Build library for iOS..." - lipo -create ${LIBSSL_IOS[@]} -output "${CURRENTPATH}/lib/libssl-iPhone.a" - lipo -create ${LIBCRYPTO_IOS[@]} -output "${CURRENTPATH}/lib/libcrypto-iPhone.a" -fi - -#Build macOS library if selected for build -if [ ${#LIBSSL_MACOS[@]} -gt 0 ]; then - echo "Build library for macOS..." - lipo -create ${LIBSSL_MACOS[@]} -output "${CURRENTPATH}/lib/libssl-MacOSX.a" - lipo -create ${LIBCRYPTO_MACOS[@]} -output "${CURRENTPATH}/lib/libcrypto-MacOSX.a" -fi - -#Build Catalyst library if selected for build -if [ ${#LIBSSL_CATALYST[@]} -gt 0 ]; then - echo "Build library for Catalyst..." - lipo -create ${LIBSSL_CATALYST[@]} -output "${CURRENTPATH}/lib/libssl-Catalyst.a" - lipo -create ${LIBCRYPTO_CATALYST[@]} -output "${CURRENTPATH}/lib/libcrypto-Catalyst.a" -fi - -# Build tvOS library if selected for build -if [ ${#LIBSSL_WATCHOS[@]} -gt 0 ]; then - echo "Build library for watchOS..." - lipo -create ${LIBSSL_WATCHOS[@]} -output "${CURRENTPATH}/lib/libssl-Watch.a" - lipo -create ${LIBCRYPTO_WATCHOS[@]} -output "${CURRENTPATH}/lib/libcrypto-Watch.a" -fi - -# Build tvOS library if selected for build -if [ ${#LIBSSL_TVOS[@]} -gt 0 ]; then - echo "Build library for tvOS..." - lipo -create ${LIBSSL_TVOS[@]} -output "${CURRENTPATH}/lib/libssl-AppleTV.a" - lipo -create ${LIBCRYPTO_TVOS[@]} -output "${CURRENTPATH}/lib/libcrypto-AppleTV.a" -fi - # Copy include directory cp -R "${INCLUDE_DIR}" "${CURRENTPATH}/include/"