From 95964fd0b3af016b0dbdfabf971f998507f9fe14 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sat, 8 Dec 2018 11:31:30 -0500 Subject: [PATCH] Backout setenv-ios.sh changes The changes did not help --- TestScripts/setenv-ios.sh | 7 +++++-- setenv-ios.sh | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/TestScripts/setenv-ios.sh b/TestScripts/setenv-ios.sh index e92294ee..9c69f22b 100755 --- a/TestScripts/setenv-ios.sh +++ b/TestScripts/setenv-ios.sh @@ -221,20 +221,23 @@ if [ "$APPLE_SDK" == "AppleTVOS" ]; then 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 -ios_simulator_version_min -DCRYPTOPP_DISABLE_ASM" + 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 +# -watchos_simulator_version_min does not work though it is in LLVM sources. if [ "$APPLE_SDK" == "WatchSimulator" ]; then - IOS_FLAGS="$IOS_FLAGS -watchos_simulator_version_min -DCRYPTOPP_DISABLE_ASM" + 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 +# -tvos_simulator_version_min does not work though it is in LLVM sources. if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then IOS_FLAGS="$IOS_FLAGS -tvos_simulator_version_min -DCRYPTOPP_DISABLE_ASM" fi diff --git a/setenv-ios.sh b/setenv-ios.sh index e92294ee..9c69f22b 100755 --- a/setenv-ios.sh +++ b/setenv-ios.sh @@ -221,20 +221,23 @@ if [ "$APPLE_SDK" == "AppleTVOS" ]; then 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 -ios_simulator_version_min -DCRYPTOPP_DISABLE_ASM" + 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 +# -watchos_simulator_version_min does not work though it is in LLVM sources. if [ "$APPLE_SDK" == "WatchSimulator" ]; then - IOS_FLAGS="$IOS_FLAGS -watchos_simulator_version_min -DCRYPTOPP_DISABLE_ASM" + 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 +# -tvos_simulator_version_min does not work though it is in LLVM sources. if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then IOS_FLAGS="$IOS_FLAGS -tvos_simulator_version_min -DCRYPTOPP_DISABLE_ASM" fi