From a6143862a370adb154141a63fc1901b29b2132d4 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 2 Aug 2018 00:13:13 -0400 Subject: [PATCH] Copy setenv-ios.sh into TestScripts This is one of the scripts we have in two places due to historical reasons. The current practice is to put them in TestScripts/ --- TestScripts/setenv-ios.sh | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/TestScripts/setenv-ios.sh b/TestScripts/setenv-ios.sh index 7cdc9cce..596ec7e4 100755 --- a/TestScripts/setenv-ios.sh +++ b/TestScripts/setenv-ios.sh @@ -195,12 +195,12 @@ fi # https://github.com/weidai11/cryptopp/issues/635 if [ "$APPLE_SDK" == "iPhoneSimulator" ]; then - IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" + IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_SSSE3" fi # Simulator fixup. LD fails to link dylib. if [ "$APPLE_SDK" == "iPhoneSimulator" ] && [ "$IOS_ARCH" == "i386" ]; then - IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=5 -DCRYPTOPP_DISABLE_ASM" + IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=5" fi # ARMv7s fixup. Xcode 4/iOS 6 @@ -220,17 +220,7 @@ fi # ARM64 Simulator fixup. Under Xcode 6/iOS 8, it uses x86_64 and not i386 if [ "$IOS_ARCH" == "x86_64" ]; then - IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=8 -DCRYPTOPP_DISABLE_ASM" -fi - -# Disable ASM for simulator -if [ "$APPLE_SDK" == "WatchSimulator" ]; then - IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" -fi - -# Disable ASM for simulator -if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then - IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" + IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=8" fi # Simulator uses i386 or x86_64, Device uses ARMv5, ARMv6, ARMv7, ARMv7s or ARMv8