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

Try -watchos_simulator_version_min and -tvos_simulator_version_min

pull/762/head
Jeffrey Walton 2018-12-08 10:37:57 -05:00
parent d48192d190
commit d1156ddfc6
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TestScripts/setenv-ios.sh
View File

@ -222,21 +222,21 @@ fi
# ARM64 Simulator fixup. Under Xcode 6/iOS 8, it uses x86_64 and not i386 # ARM64 Simulator fixup. Under Xcode 6/iOS 8, it uses x86_64 and not i386
if [ "$IOS_ARCH" == "x86_64" ]; then if [ "$IOS_ARCH" == "x86_64" ]; then
IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=8 -DCRYPTOPP_DISABLE_ASM" IOS_FLAGS="$IOS_FLAGS -ios_simulator_version_min -DCRYPTOPP_DISABLE_ASM"
fi 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
if [ "$APPLE_SDK" == "WatchSimulator" ]; then if [ "$APPLE_SDK" == "WatchSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" IOS_FLAGS="$IOS_FLAGS -watchos_simulator_version_min -DCRYPTOPP_DISABLE_ASM"
fi 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
if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" IOS_FLAGS="$IOS_FLAGS -tvos_simulator_version_min -DCRYPTOPP_DISABLE_ASM"
fi fi
# Simulator uses i386 or x86_64, Device uses ARMv5, ARMv6, ARMv7, ARMv7s or ARMv8 # Simulator uses i386 or x86_64, Device uses ARMv5, ARMv6, ARMv7, ARMv7s or ARMv8

6
setenv-ios.sh
View File

@ -222,21 +222,21 @@ fi
# ARM64 Simulator fixup. Under Xcode 6/iOS 8, it uses x86_64 and not i386 # ARM64 Simulator fixup. Under Xcode 6/iOS 8, it uses x86_64 and not i386
if [ "$IOS_ARCH" == "x86_64" ]; then if [ "$IOS_ARCH" == "x86_64" ]; then
IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=8 -DCRYPTOPP_DISABLE_ASM" IOS_FLAGS="$IOS_FLAGS -ios_simulator_version_min -DCRYPTOPP_DISABLE_ASM"
fi 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
if [ "$APPLE_SDK" == "WatchSimulator" ]; then if [ "$APPLE_SDK" == "WatchSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" IOS_FLAGS="$IOS_FLAGS -watchos_simulator_version_min -DCRYPTOPP_DISABLE_ASM"
fi 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
if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" IOS_FLAGS="$IOS_FLAGS -tvos_simulator_version_min -DCRYPTOPP_DISABLE_ASM"
fi fi
# Simulator uses i386 or x86_64, Device uses ARMv5, ARMv6, ARMv7, ARMv7s or ARMv8 # Simulator uses i386 or x86_64, Device uses ARMv5, ARMv6, ARMv7, ARMv7s or ARMv8