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

Backout setenv-ios.sh changes 

The changes did not help
pull/762/head
Jeffrey Walton 2018-12-08 11:31:30 -05:00
parent d1156ddfc6
commit 95964fd0b3
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
TestScripts/setenv-ios.sh
View File

@ -221,20 +221,23 @@ if [ "$APPLE_SDK" == "AppleTVOS" ]; then
fi fi
# ARM64 Simulator fixup. Under Xcode 6/iOS 8, it uses x86_64 and not i386 # 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 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 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.
# We may need to link against crt1.o for simulator builds. Also see # We may need to link against crt1.o for simulator builds. Also see
# https://stackoverflow.com/q/24841283/608639 # https://stackoverflow.com/q/24841283/608639
# -watchos_simulator_version_min does not work though it is in LLVM sources.
if [ "$APPLE_SDK" == "WatchSimulator" ]; then if [ "$APPLE_SDK" == "WatchSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -watchos_simulator_version_min -DCRYPTOPP_DISABLE_ASM" 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.
# We may need to link against crt1.o for simulator builds. Also see # We may need to link against crt1.o for simulator builds. Also see
# https://stackoverflow.com/q/24841283/608639 # https://stackoverflow.com/q/24841283/608639
# -tvos_simulator_version_min does not work though it is in LLVM sources.
if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -tvos_simulator_version_min -DCRYPTOPP_DISABLE_ASM" IOS_FLAGS="$IOS_FLAGS -tvos_simulator_version_min -DCRYPTOPP_DISABLE_ASM"
fi fi

7
setenv-ios.sh
View File

@ -221,20 +221,23 @@ if [ "$APPLE_SDK" == "AppleTVOS" ]; then
fi fi
# ARM64 Simulator fixup. Under Xcode 6/iOS 8, it uses x86_64 and not i386 # 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 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 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.
# We may need to link against crt1.o for simulator builds. Also see # We may need to link against crt1.o for simulator builds. Also see
# https://stackoverflow.com/q/24841283/608639 # https://stackoverflow.com/q/24841283/608639
# -watchos_simulator_version_min does not work though it is in LLVM sources.
if [ "$APPLE_SDK" == "WatchSimulator" ]; then if [ "$APPLE_SDK" == "WatchSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -watchos_simulator_version_min -DCRYPTOPP_DISABLE_ASM" 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.
# We may need to link against crt1.o for simulator builds. Also see # We may need to link against crt1.o for simulator builds. Also see
# https://stackoverflow.com/q/24841283/608639 # https://stackoverflow.com/q/24841283/608639
# -tvos_simulator_version_min does not work though it is in LLVM sources.
if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then
IOS_FLAGS="$IOS_FLAGS -tvos_simulator_version_min -DCRYPTOPP_DISABLE_ASM" IOS_FLAGS="$IOS_FLAGS -tvos_simulator_version_min -DCRYPTOPP_DISABLE_ASM"
fi fi