From d48192d190c889f65c2f30291dbbb4ac97a8cc7a Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sat, 8 Dec 2018 10:24:58 -0500 Subject: [PATCH] Remove -no_new_main from Apple Watch and TV simulators It did not help... --- TestScripts/setenv-ios.sh | 10 ++++++---- setenv-ios.sh | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/TestScripts/setenv-ios.sh b/TestScripts/setenv-ios.sh index 9e2f59ff..65dd3110 100755 --- a/TestScripts/setenv-ios.sh +++ b/TestScripts/setenv-ios.sh @@ -226,15 +226,17 @@ if [ "$IOS_ARCH" == "x86_64" ]; then fi # Disable ASM for simulator. We are failing on Travis due to missing _start. -# Also see https://stackoverflow.com/q/24841283/608639 +# 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 -no_new_main" + IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" fi # Disable ASM for simulator. We are failing on Travis due to missing _start. -# Also see https://stackoverflow.com/q/24841283/608639 +# 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 -no_new_main" + IOS_FLAGS="$IOS_FLAGS -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 9e2f59ff..65dd3110 100755 --- a/setenv-ios.sh +++ b/setenv-ios.sh @@ -226,15 +226,17 @@ if [ "$IOS_ARCH" == "x86_64" ]; then fi # Disable ASM for simulator. We are failing on Travis due to missing _start. -# Also see https://stackoverflow.com/q/24841283/608639 +# 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 -no_new_main" + IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" fi # Disable ASM for simulator. We are failing on Travis due to missing _start. -# Also see https://stackoverflow.com/q/24841283/608639 +# 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 -no_new_main" + IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" fi # Simulator uses i386 or x86_64, Device uses ARMv5, ARMv6, ARMv7, ARMv7s or ARMv8