mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
133 lines
4.8 KiB
Diff
133 lines
4.8 KiB
Diff
From 654c44d26bd86efec4019990beac67900231f868 Mon Sep 17 00:00:00 2001
|
|
From: Ali <>
|
|
Date: Wed, 16 Dec 2020 17:11:29 +0400
|
|
Subject: [PATCH] Add support for arm64-iphonesimulator-gcc
|
|
|
|
---
|
|
build/make/configure.sh | 73 ++++++++++++++++++++++++++++++++++++++++-
|
|
configure | 3 +-
|
|
2 files changed, 74 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/build/make/configure.sh b/build/make/configure.sh
|
|
index 206b54f77..1c113e51d 100644
|
|
--- a/build/make/configure.sh
|
|
+++ b/build/make/configure.sh
|
|
@@ -845,6 +845,14 @@ process_common_toolchain() {
|
|
# Handle darwin variants. Newer SDKs allow targeting older
|
|
# platforms, so use the newest one available.
|
|
case ${toolchain} in
|
|
+ arm64-iphonesimulator*)
|
|
+ add_cflags "-miphonesimulator-version-min=${IOS_VERSION_MIN}"
|
|
+ iphonesimulator_sdk_dir="$(show_darwin_sdk_path iphonesimulator)"
|
|
+ if [ -d "${iphonesimulator_sdk_dir}" ]; then
|
|
+ add_cflags "-isysroot ${iphonesimulator_sdk_dir}"
|
|
+ add_ldflags "-isysroot ${iphonesimulator_sdk_dir}"
|
|
+ fi
|
|
+ ;;
|
|
arm*-darwin*)
|
|
add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
|
|
iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)"
|
|
@@ -934,7 +942,7 @@ process_common_toolchain() {
|
|
|
|
# Process ARM architecture variants
|
|
case ${toolchain} in
|
|
- arm*)
|
|
+ arm*|arm64-iphonesimulator-gcc)
|
|
# on arm, isa versions are supersets
|
|
case ${tgt_isa} in
|
|
arm64|armv8)
|
|
@@ -1144,6 +1152,69 @@ EOF
|
|
asm_conversion_cmd="${source_path}/build/make/ads2gas_apple.pl"
|
|
;;
|
|
|
|
+ iphonesimulator*)
|
|
+ if ! enabled external_build; then
|
|
+ XCRUN_FIND="xcrun --sdk iphonesimulator --find"
|
|
+ CXX="$(${XCRUN_FIND} clang++)"
|
|
+ CC="$(${XCRUN_FIND} clang)"
|
|
+ AR="$(${XCRUN_FIND} ar)"
|
|
+ AS="$(${XCRUN_FIND} as)"
|
|
+ STRIP="$(${XCRUN_FIND} strip)"
|
|
+ NM="$(${XCRUN_FIND} nm)"
|
|
+ RANLIB="$(${XCRUN_FIND} ranlib)"
|
|
+ AS_SFX=.S
|
|
+ LD="${CXX:-$(${XCRUN_FIND} ld)}"
|
|
+
|
|
+ # ASFLAGS is written here instead of using check_add_asflags
|
|
+ # because we need to overwrite all of ASFLAGS and purge the
|
|
+ # options that were put in above
|
|
+ ASFLAGS="-arch ${tgt_isa} -g"
|
|
+
|
|
+ add_cflags -arch ${tgt_isa}
|
|
+ add_ldflags -arch ${tgt_isa}
|
|
+
|
|
+ add_cflags --target=arm64-apple-ios7.0-simulator
|
|
+ add_ldflags --target=arm64-apple-ios7.0-simulator
|
|
+
|
|
+ alt_libc="$(show_darwin_sdk_path iphonesimulator)"
|
|
+ if [ -d "${alt_libc}" ]; then
|
|
+ add_cflags -isysroot ${alt_libc}
|
|
+ fi
|
|
+
|
|
+ if [ "${LD}" = "${CXX}" ]; then
|
|
+ add_ldflags -miphonesimulator-version-min="${IOS_VERSION_MIN}"
|
|
+ else
|
|
+ add_ldflags -ios_version_min "${IOS_VERSION_MIN}"
|
|
+ fi
|
|
+
|
|
+ for d in lib usr/lib usr/lib/system; do
|
|
+ try_dir="${alt_libc}/${d}"
|
|
+ [ -d "${try_dir}" ] && add_ldflags -L"${try_dir}"
|
|
+ done
|
|
+
|
|
+ case ${tgt_isa} in
|
|
+ armv7|armv7s|armv8|arm64)
|
|
+ if enabled neon && ! check_xcode_minimum_version; then
|
|
+ soft_disable neon
|
|
+ log_echo " neon disabled: upgrade Xcode (need v6.3+)."
|
|
+ if enabled neon_asm; then
|
|
+ soft_disable neon_asm
|
|
+ log_echo " neon_asm disabled: upgrade Xcode (need v6.3+)."
|
|
+ fi
|
|
+ fi
|
|
+ ;;
|
|
+ esac
|
|
+
|
|
+ if [ "$(show_darwin_sdk_major_version iphoneos)" -gt 8 ]; then
|
|
+ check_add_cflags -fembed-bitcode
|
|
+ check_add_asflags -fembed-bitcode
|
|
+ check_add_ldflags -fembed-bitcode
|
|
+ fi
|
|
+ fi
|
|
+
|
|
+ asm_conversion_cmd="${source_path}/build/make/ads2gas_apple.pl"
|
|
+ ;;
|
|
+
|
|
linux*)
|
|
enable_feature linux
|
|
if enabled rvct; then
|
|
diff --git a/configure b/configure
|
|
index 32272ce36..826769948 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -99,6 +99,7 @@ EOF
|
|
# alphabetically by architecture, generic-gnu last.
|
|
all_platforms="${all_platforms} arm64-android-gcc"
|
|
all_platforms="${all_platforms} arm64-darwin-gcc"
|
|
+all_platforms="${all_platforms} arm64-iphonesimulator-gcc"
|
|
all_platforms="${all_platforms} arm64-linux-gcc"
|
|
all_platforms="${all_platforms} arm64-win64-gcc"
|
|
all_platforms="${all_platforms} arm64-win64-vs15"
|
|
@@ -733,7 +734,7 @@ process_toolchain() {
|
|
soft_enable libyuv
|
|
# GTestLog must be modified to use Android logging utilities.
|
|
;;
|
|
- *-darwin-*)
|
|
+ *-darwin-*|arm64-iphonesimulator-*)
|
|
check_add_cxxflags -std=c++11
|
|
# iOS/ARM builds do not work with gtest. This does not match
|
|
# x86 targets.
|
|
--
|
|
2.24.3 (Apple Git-128)
|
|
|