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

Remove -no_new_main from Apple Watch and TV simulators 

It did not help...
pull/762/head
Jeffrey Walton 2018-12-08 10:24:58 -05:00
parent 1e9a487b47
commit d48192d190
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
TestScripts/setenv-ios.sh
View File

@ -226,15 +226,17 @@ if [ "$IOS_ARCH" == "x86_64" ]; then
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.
# 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 if [ "$APPLE_SDK" == "WatchSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM -no_new_main" IOS_FLAGS="$IOS_FLAGS -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.
# 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 if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM -no_new_main" IOS_FLAGS="$IOS_FLAGS -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

10
setenv-ios.sh
View File

@ -226,15 +226,17 @@ if [ "$IOS_ARCH" == "x86_64" ]; then
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.
# 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 if [ "$APPLE_SDK" == "WatchSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM -no_new_main" IOS_FLAGS="$IOS_FLAGS -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.
# 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 if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM -no_new_main" IOS_FLAGS="$IOS_FLAGS -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