From 55b1535a181ef39967a35ef1c9928b9d94565340 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sat, 8 Dec 2018 09:03:38 -0500
Subject: [PATCH] Try to fix Watch and TV simulator link error Something about
 a missing _start symbol. I'm not sure if -no_new_main is the solution or not.
 Also see https://stackoverflow.com/q/24841283/608639.

---
 TestScripts/setenv-ios.sh | 14 ++++++++------
 setenv-ios.sh             | 12 ++++++++----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/TestScripts/setenv-ios.sh b/TestScripts/setenv-ios.sh
index 089bfd31..9e2f59ff 100755
--- a/TestScripts/setenv-ios.sh
+++ b/TestScripts/setenv-ios.sh
@@ -50,13 +50,13 @@ do
   # i386 (simulator)
   if [ "$CL" == "i386" ]; then
     IOS_ARCH=i386
-	APPLE_SDK=iPhoneSimulator
+    APPLE_SDK=iPhoneSimulator
   fi
 
   # x86_64 (simulator)
   if [ "$CL" == "x86_64" ]; then
     IOS_ARCH=x86_64
-	APPLE_SDK=iPhoneSimulator
+    APPLE_SDK=iPhoneSimulator
   fi
 
   # ARMv5
@@ -225,14 +225,16 @@ if [ "$IOS_ARCH" == "x86_64" ]; then
   IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=8 -DCRYPTOPP_DISABLE_ASM"
 fi
 
-# Disable ASM for simulator
+# Disable ASM for simulator. We are failing on Travis due to missing _start.
+# Also see https://stackoverflow.com/q/24841283/608639
 if [ "$APPLE_SDK" == "WatchSimulator" ]; then
-  IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM"
+  IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM -no_new_main"
 fi
 
-# Disable ASM for simulator
+# Disable ASM for simulator. We are failing on Travis due to missing _start.
+# Also see https://stackoverflow.com/q/24841283/608639
 if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then
-  IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM"
+  IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM -no_new_main"
 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 7cdc9cce..9e2f59ff 100755
--- a/setenv-ios.sh
+++ b/setenv-ios.sh
@@ -50,11 +50,13 @@ do
   # i386 (simulator)
   if [ "$CL" == "i386" ]; then
     IOS_ARCH=i386
+    APPLE_SDK=iPhoneSimulator
   fi
 
   # x86_64 (simulator)
   if [ "$CL" == "x86_64" ]; then
     IOS_ARCH=x86_64
+    APPLE_SDK=iPhoneSimulator
   fi
 
   # ARMv5
@@ -223,14 +225,16 @@ if [ "$IOS_ARCH" == "x86_64" ]; then
   IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=8 -DCRYPTOPP_DISABLE_ASM"
 fi
 
-# Disable ASM for simulator
+# Disable ASM for simulator. We are failing on Travis due to missing _start.
+# Also see https://stackoverflow.com/q/24841283/608639
 if [ "$APPLE_SDK" == "WatchSimulator" ]; then
-  IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM"
+  IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM -no_new_main"
 fi
 
-# Disable ASM for simulator
+# Disable ASM for simulator. We are failing on Travis due to missing _start.
+# Also see https://stackoverflow.com/q/24841283/608639
 if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then
-  IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM"
+  IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM -no_new_main"
 fi
 
 # Simulator uses i386 or x86_64, Device uses ARMv5, ARMv6, ARMv7, ARMv7s or ARMv8