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

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.
pull/762/head
Jeffrey Walton 2018-12-08 09:03:38 -05:00
parent c531c1c550
commit 55b1535a18
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
TestScripts/setenv-ios.sh
View File

@ -50,13 +50,13 @@ do
# i386 (simulator) # i386 (simulator)
if [ "$CL" == "i386" ]; then if [ "$CL" == "i386" ]; then
IOS_ARCH=i386 IOS_ARCH=i386
APPLE_SDK=iPhoneSimulator APPLE_SDK=iPhoneSimulator
fi fi
# x86_64 (simulator) # x86_64 (simulator)
if [ "$CL" == "x86_64" ]; then if [ "$CL" == "x86_64" ]; then
IOS_ARCH=x86_64 IOS_ARCH=x86_64
APPLE_SDK=iPhoneSimulator APPLE_SDK=iPhoneSimulator
fi fi
# ARMv5 # ARMv5
@ -225,14 +225,16 @@ if [ "$IOS_ARCH" == "x86_64" ]; then
IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=8 -DCRYPTOPP_DISABLE_ASM" IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=8 -DCRYPTOPP_DISABLE_ASM"
fi 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 if [ "$APPLE_SDK" == "WatchSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM -no_new_main"
fi 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 if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM -no_new_main"
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

12
setenv-ios.sh
View File

@ -50,11 +50,13 @@ do
# i386 (simulator) # i386 (simulator)
if [ "$CL" == "i386" ]; then if [ "$CL" == "i386" ]; then
IOS_ARCH=i386 IOS_ARCH=i386
APPLE_SDK=iPhoneSimulator
fi fi
# x86_64 (simulator) # x86_64 (simulator)
if [ "$CL" == "x86_64" ]; then if [ "$CL" == "x86_64" ]; then
IOS_ARCH=x86_64 IOS_ARCH=x86_64
APPLE_SDK=iPhoneSimulator
fi fi
# ARMv5 # ARMv5
@ -223,14 +225,16 @@ if [ "$IOS_ARCH" == "x86_64" ]; then
IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=8 -DCRYPTOPP_DISABLE_ASM" IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=8 -DCRYPTOPP_DISABLE_ASM"
fi 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 if [ "$APPLE_SDK" == "WatchSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM -no_new_main"
fi 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 if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM" IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM -no_new_main"
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