arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't add the flag CRYPTOPP_DISABLE_ASM twice for iPhone simulator builds (GH #778)

pull/784/head
Javier Navarro 2019-01-11 22:40:48 +01:00 committed by Jeffrey Walton
parent fdfcb2a172
commit 982655845a
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
TestScripts/setenv-ios.sh
View File

@ -206,7 +206,7 @@ fi
# Simulator fixup. LD fails to link dylib. # Simulator fixup. LD fails to link dylib.
if [ "$APPLE_SDK" == "iPhoneSimulator" ] && [ "$IOS_ARCH" == "i386" ]; then 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 fi
# ARMv7s fixup. Xcode 4/iOS 6 # ARMv7s fixup. Xcode 4/iOS 6
@ -224,12 +224,6 @@ if [ "$APPLE_SDK" == "AppleTVOS" ]; then
IOS_FLAGS="" IOS_FLAGS=""
fi 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. # 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 # We may need to link against crt1.o for simulator builds. Also see
# https://stackoverflow.com/q/24841283/608639 # https://stackoverflow.com/q/24841283/608639

8
setenv-ios.sh
View File

@ -206,7 +206,7 @@ fi
# Simulator fixup. LD fails to link dylib. # Simulator fixup. LD fails to link dylib.
if [ "$APPLE_SDK" == "iPhoneSimulator" ] && [ "$IOS_ARCH" == "i386" ]; then 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 fi
# ARMv7s fixup. Xcode 4/iOS 6 # ARMv7s fixup. Xcode 4/iOS 6
@ -224,12 +224,6 @@ if [ "$APPLE_SDK" == "AppleTVOS" ]; then
IOS_FLAGS="" IOS_FLAGS=""
fi 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. # 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 # We may need to link against crt1.o for simulator builds. Also see
# https://stackoverflow.com/q/24841283/608639 # https://stackoverflow.com/q/24841283/608639