Copy setenv-ios.sh into TestScripts
This is one of the scripts we have in two places due to historical reasons. The current practice is to put them in TestScripts/pull/696/head
parent
85ea200ff0
commit
fdc3045e34
|
|
@ -195,12 +195,12 @@ fi
|
||||||
|
|
||||||
# https://github.com/weidai11/cryptopp/issues/635
|
# https://github.com/weidai11/cryptopp/issues/635
|
||||||
if [ "$APPLE_SDK" == "iPhoneSimulator" ]; then
|
if [ "$APPLE_SDK" == "iPhoneSimulator" ]; then
|
||||||
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_SSSE3"
|
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Simulator fixup. LD fails to link dylib.
|
# Simulator fixup. LD fails to link dylib.
|
||||||
if [ "$APPLE_SDK" == "iPhoneSimulator" ] && [ "$IOS_ARCH" == "i386" ]; then
|
if [ "$APPLE_SDK" == "iPhoneSimulator" ] && [ "$IOS_ARCH" == "i386" ]; then
|
||||||
IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=5"
|
IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=5 -DCRYPTOPP_DISABLE_ASM"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ARMv7s fixup. Xcode 4/iOS 6
|
# ARMv7s fixup. Xcode 4/iOS 6
|
||||||
|
|
@ -220,7 +220,17 @@ 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
|
||||||
if [ "$IOS_ARCH" == "x86_64" ]; then
|
if [ "$IOS_ARCH" == "x86_64" ]; then
|
||||||
IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=8"
|
IOS_FLAGS="$IOS_FLAGS -miphoneos-version-min=8 -DCRYPTOPP_DISABLE_ASM"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Disable ASM for simulator
|
||||||
|
if [ "$APPLE_SDK" == "WatchSimulator" ]; then
|
||||||
|
IOS_FLAGS="$IOS_FLAGS -DCRYPTOPP_DISABLE_ASM"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Disable ASM for simulator
|
||||||
|
if [ "$APPLE_SDK" == "AppleTVSimulator" ]; then
|
||||||
|
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
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue