From d1156ddfc629947d2ed9777fe86b660cb2bcf8a0 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sat, 8 Dec 2018 10:37:57 -0500 Subject: [PATCH] Try -watchos_simulator_version_min and -tvos_simulator_version_min --- TestScripts/setenv-ios.sh | 6 +++--- setenv-ios.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TestScripts/setenv-ios.sh b/TestScripts/setenv-ios.sh index 65dd3110..e92294ee 100755 --- a/TestScripts/setenv-ios.sh +++ b/TestScripts/setenv-ios.sh @@ -222,21 +222,21 @@ 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" + IOS_FLAGS="$IOS_FLAGS -ios_simulator_version_min -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 if [ "$APPLE_SDK" == "WatchSimulator" ]; then - IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" + IOS_FLAGS="$IOS_FLAGS -watchos_simulator_version_min -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 if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then - IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" + IOS_FLAGS="$IOS_FLAGS -tvos_simulator_version_min -DCRYPTOPP_DISABLE_ASM" fi # Simulator uses i386 or x86_64, Device uses ARMv5, ARMv6, ARMv7, ARMv7s or ARMv8 diff --git a/setenv-ios.sh b/setenv-ios.sh index 65dd3110..e92294ee 100755 --- a/setenv-ios.sh +++ b/setenv-ios.sh @@ -222,21 +222,21 @@ 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" + IOS_FLAGS="$IOS_FLAGS -ios_simulator_version_min -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 if [ "$APPLE_SDK" == "WatchSimulator" ]; then - IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" + IOS_FLAGS="$IOS_FLAGS -watchos_simulator_version_min -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 if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then - IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" + IOS_FLAGS="$IOS_FLAGS -tvos_simulator_version_min -DCRYPTOPP_DISABLE_ASM" fi # Simulator uses i386 or x86_64, Device uses ARMv5, ARMv6, ARMv7, ARMv7s or ARMv8