From 982655845a784a9a4cfbc92221359a25a74184a3 Mon Sep 17 00:00:00 2001 From: Javier Navarro Date: Fri, 11 Jan 2019 22:40:48 +0100 Subject: [PATCH] Don't add the flag CRYPTOPP_DISABLE_ASM twice for iPhone simulator builds (GH #778) --- TestScripts/setenv-ios.sh | 8 +------- setenv-ios.sh | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/TestScripts/setenv-ios.sh b/TestScripts/setenv-ios.sh index fcf36461..efd6a8b5 100755 --- a/TestScripts/setenv-ios.sh +++ b/TestScripts/setenv-ios.sh @@ -206,7 +206,7 @@ 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 @@ -224,12 +224,6 @@ if [ "$APPLE_SDK" == "AppleTVOS" ]; then IOS_FLAGS="" fi -# ARM64 Simulator fixup. Under Xcode 6/iOS 8, it uses x86_64 and not i386 -# -ios_simulator_version_min does not work though it is in LLVM sources. -if [ "$IOS_ARCH" == "x86_64" ]; then - IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" -fi - # Disable ASM for simulator. We are failing on Travis due to missing _start. # We may need to link against crt1.o for simulator builds. Also see # https://stackoverflow.com/q/24841283/608639 diff --git a/setenv-ios.sh b/setenv-ios.sh index fcf36461..efd6a8b5 100755 --- a/setenv-ios.sh +++ b/setenv-ios.sh @@ -206,7 +206,7 @@ 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 @@ -224,12 +224,6 @@ if [ "$APPLE_SDK" == "AppleTVOS" ]; then IOS_FLAGS="" fi -# ARM64 Simulator fixup. Under Xcode 6/iOS 8, it uses x86_64 and not i386 -# -ios_simulator_version_min does not work though it is in LLVM sources. -if [ "$IOS_ARCH" == "x86_64" ]; then - IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" -fi - # Disable ASM for simulator. We are failing on Travis due to missing _start. # We may need to link against crt1.o for simulator builds. Also see # https://stackoverflow.com/q/24841283/608639