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

Fix iPhoneSimulator build (GH #635)

pull/640/head
Jeffrey Walton 2018-04-05 08:00:25 -04:00
parent c27d3a9442
commit 37d723e680
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
TestScripts/setenv-ios.sh
View File

@ -193,29 +193,34 @@ if [ -z "$XCODE_SDK" ]; then
[ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1 [ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
fi fi
# https://github.com/weidai11/cryptopp/issues/635
if [ "$APPLE_SDK" == "iPhoneSimulator" ]; then
IOS_FLAGS += -DCRYPTOPP_DISABLE_SSSE3
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=-miphoneos-version-min=5 IOS_FLAGS += -miphoneos-version-min=5
fi fi
# ARMv7s fixup. Xcode 4/iOS 6 # ARMv7s fixup. Xcode 4/iOS 6
if [ "$IOS_ARCH" == "armv7s" ]; then if [ "$IOS_ARCH" == "armv7s" ]; then
IOS_FLAGS=-miphoneos-version-min=6 IOS_FLAGS += -miphoneos-version-min=6
fi fi
# ARM64 fixup. Xcode 5/iOS 7 # ARM64 fixup. Xcode 5/iOS 7
if [ "$IOS_ARCH" == "arm64" ]; then if [ "$IOS_ARCH" == "arm64" ]; then
IOS_FLAGS=-miphoneos-version-min=7 IOS_FLAGS = -miphoneos-version-min=7
fi fi
# Yet another ARM64 fixup. # Yet another ARM64 fixup.
if [ "$APPLE_SDK" == "AppleTVOS" ]; then if [ "$APPLE_SDK" == "AppleTVOS" ]; then
IOS_FLAGS="" IOS_FLAGS = ""
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
if [ "$IOS_ARCH" == "x86_64" ]; then if [ "$IOS_ARCH" == "x86_64" ]; then
IOS_FLAGS=-miphoneos-version-min=8 IOS_FLAGS += -miphoneos-version-min=8
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

15
setenv-ios.sh
View File

@ -193,29 +193,34 @@ if [ -z "$XCODE_SDK" ]; then
[ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1 [ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
fi fi
# https://github.com/weidai11/cryptopp/issues/635
if [ "$APPLE_SDK" == "iPhoneSimulator" ]; then
IOS_FLAGS += -DCRYPTOPP_DISABLE_SSSE3
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=-miphoneos-version-min=5 IOS_FLAGS += -miphoneos-version-min=5
fi fi
# ARMv7s fixup. Xcode 4/iOS 6 # ARMv7s fixup. Xcode 4/iOS 6
if [ "$IOS_ARCH" == "armv7s" ]; then if [ "$IOS_ARCH" == "armv7s" ]; then
IOS_FLAGS=-miphoneos-version-min=6 IOS_FLAGS += -miphoneos-version-min=6
fi fi
# ARM64 fixup. Xcode 5/iOS 7 # ARM64 fixup. Xcode 5/iOS 7
if [ "$IOS_ARCH" == "arm64" ]; then if [ "$IOS_ARCH" == "arm64" ]; then
IOS_FLAGS=-miphoneos-version-min=7 IOS_FLAGS = -miphoneos-version-min=7
fi fi
# Yet another ARM64 fixup. # Yet another ARM64 fixup.
if [ "$APPLE_SDK" == "AppleTVOS" ]; then if [ "$APPLE_SDK" == "AppleTVOS" ]; then
IOS_FLAGS="" IOS_FLAGS = ""
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
if [ "$IOS_ARCH" == "x86_64" ]; then if [ "$IOS_ARCH" == "x86_64" ]; then
IOS_FLAGS=-miphoneos-version-min=8 IOS_FLAGS += -miphoneos-version-min=8
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