diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 1493a3343..7ce2acb3b 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -1944,7 +1944,6 @@ CURRENT_PROJECT_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", "External/libssh2-ios/include/libssh2", @@ -2009,7 +2008,6 @@ CURRENT_PROJECT_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", "External/libssh2-ios/include/libssh2", @@ -2042,7 +2040,6 @@ CURRENT_PROJECT_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", "External/libssh2-ios/include/libssh2", @@ -2075,7 +2072,6 @@ CURRENT_PROJECT_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", "External/libssh2-ios/include/libssh2", diff --git a/script/update_libgit2_ios b/script/update_libgit2_ios index 46029cbb8..7732f32e9 100755 --- a/script/update_libgit2_ios +++ b/script/update_libgit2_ios @@ -51,6 +51,7 @@ function build_libgit2 () -DBUILD_CLAR:BOOL=OFF \ -DTHREADSAFE:BOOL=ON \ -DCURL:BOOL=OFF \ + -DCMAKE_C_FLAGS:STRING="-fembed-bitcode" \ "${SYS_ROOT}" \ -DCMAKE_OSX_ARCHITECTURES:STRING="${ARCH}" \ .. >> "${LOG}" 2>&1 diff --git a/script/update_libssh2_ios b/script/update_libssh2_ios index 18d8a9fc2..8dd89c51c 100755 --- a/script/update_libssh2_ios +++ b/script/update_libssh2_ios @@ -24,8 +24,8 @@ function build_ssh2 () cp -R "${ROOT_PATH}/External/libssh2" "${ROOT_PATH}/External/libssh2-ios/src/" pushd "${ROOT_PATH}/External/libssh2-ios/src/libssh2" > /dev/null - export CFLAGS="-arch ${ARCH} -pipe -no-cpp-precomp -isysroot ${SDKROOT} -miphoneos-version-min=${IPHONEOS_DEPLOYMENT_TARGET}" - export CPPFLAGS="-arch ${ARCH} -pipe -no-cpp-precomp -isysroot ${SDKROOT} -miphoneos-version-min=${IPHONEOS_DEPLOYMENT_TARGET}" + export CFLAGS="-arch ${ARCH} -fembed-bitcode -pipe -no-cpp-precomp -isysroot ${SDKROOT} -miphoneos-version-min=${IPHONEOS_DEPLOYMENT_TARGET}" + export CPPFLAGS="-arch ${ARCH} -fembed-bitcode -pipe -no-cpp-precomp -isysroot ${SDKROOT} -miphoneos-version-min=${IPHONEOS_DEPLOYMENT_TARGET}" mkdir -p "${ROOT_PATH}/External/libssh2-ios/bin/${SDKNAME}-${ARCH}.sdk" LOG="${ROOT_PATH}/External/libssh2-ios/bin/${SDKNAME}-${ARCH}.sdk/build-libssh2.log" diff --git a/script/update_libssl_ios b/script/update_libssl_ios index 3d3a209dc..54c0a9a1e 100755 --- a/script/update_libssl_ios +++ b/script/update_libssl_ios @@ -43,7 +43,7 @@ function build_ssl () echo "$LOG" ./Configure ${HOST} ${CONFIG} --openssldir="/tmp/openssl-${ARCH}" >> "${LOG}" 2>&1 - perl -i -pe "s|^CC= gcc|CC= ${CLANG} -miphoneos-version-min=${IPHONEOS_DEPLOYMENT_TARGET} -arch ${ARCH} |g" Makefile >> "${LOG}" 2>&1 + perl -i -pe "s|^CC= gcc|CC= ${CLANG} -miphoneos-version-min=${IPHONEOS_DEPLOYMENT_TARGET} -arch ${ARCH} -fembed-bitcode |g" Makefile >> "${LOG}" 2>&1 perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${SDKROOT} \$1|g" Makefile >> "${LOG}" 2>&1 make >> "${LOG}" 2>&1