From 3766b3f3af81012d0bca9809e77df2da4b45bd0f Mon Sep 17 00:00:00 2001 From: Maksim Date: Thu, 26 Nov 2020 15:11:56 +0100 Subject: [PATCH] iOS: don't build deps for unused arches --- build/iOS/deps/libcurl.sh | 2 +- build/iOS/deps/luajit.sh | 8 -------- build/iOS/deps/sdk.sh | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/build/iOS/deps/libcurl.sh b/build/iOS/deps/libcurl.sh index a9a7a98b..754c2913 100755 --- a/build/iOS/deps/libcurl.sh +++ b/build/iOS/deps/libcurl.sh @@ -17,7 +17,7 @@ for x in armv7 arm64; do if [ $x = armv7 ]; then CURL_CFLAGS="-arch armv7 $IOS_FLAGS_NOARCH" else - CURL_CFLAGS="-arch arm64 -arch arm64e $IOS_FLAGS_NOARCH" + CURL_CFLAGS="-arch arm64 $IOS_FLAGS_NOARCH" fi CFLAGS="$CURL_CFLAGS" \ ./configure --host=arm-apple-darwin --prefix=/ --disable-shared --enable-static \ diff --git a/build/iOS/deps/luajit.sh b/build/iOS/deps/luajit.sh index df9a0f41..2ac2651b 100755 --- a/build/iOS/deps/luajit.sh +++ b/build/iOS/deps/luajit.sh @@ -30,14 +30,6 @@ make amalg -j \ mv src/libluajit.a templib_64.a make clean -# 64-bit [arm64e] -make amalg -j \ - DEFAULT_CC=clang HOST_CC=clang CROSS="$(dirname $IOS_CC)/" TARGET_SYS=iOS \ - TARGET_FLAGS="-arch arm64e $IOS_FLAGS_NOARCH" \ - TARGET_CFLAGS+="-Wno-implicit-function-declaration" -mv src/libluajit.a templib_64e.a -make clean - # repack into one .a lipo -create templib_*.a -output libluajit.a rm templib_*.a diff --git a/build/iOS/deps/sdk.sh b/build/iOS/deps/sdk.sh index 27fa2fbf..11915326 100755 --- a/build/iOS/deps/sdk.sh +++ b/build/iOS/deps/sdk.sh @@ -7,5 +7,5 @@ osver=10.3 export IOS_COMPILER=$(xcrun --sdk $sdk --find clang) export IOS_CC=$IOS_COMPILER export IOS_CXX=$IOS_COMPILER -export IOS_FLAGS="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -arch armv7 -arch armv7s -arch arm64 -arch arm64e -miphoneos-version-min=$osver -fvisibility=hidden -fdata-sections -ffunction-sections -fno-unwind-tables -fno-asynchronous-unwind-tables -Ofast" +export IOS_FLAGS="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -arch armv7 -arch arm64 -miphoneos-version-min=$osver -fvisibility=hidden -fdata-sections -ffunction-sections -fno-unwind-tables -fno-asynchronous-unwind-tables -Ofast" export IOS_FLAGS_NOARCH="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -miphoneos-version-min=$osver -fvisibility=hidden -fdata-sections -ffunction-sections -Ofast"