diff --git a/dist-build/ios.sh b/dist-build/ios.sh index 1fa72011..de39481e 100755 --- a/dist-build/ios.sh +++ b/dist-build/ios.sh @@ -16,15 +16,14 @@ export SIMULATOR32_PREFIX="$PREFIX/tmp/simulator32" export SIMULATOR64_PREFIX="$PREFIX/tmp/simulator64" export XCODEDIR=$(xcode-select -p) -echo 'int main(void) { return 0; }' > conftest.c -if clang -arch armv7 conftest.c 2> /dev/null; then - export IOS_SIMULATOR_VERSION_MIN=${IOS_SIMULATOR_VERSION_MIN-"5.1.1"} - export IOS_VERSION_MIN=${IOS_VERSION_MIN-"5.1.1"} -else +xcode_major=$(xcodebuild -version|egrep '^Xcode '|cut -d' ' -f2|cut -d. -f1) +if [ $xcode_major -ge 8 ]; then export IOS_SIMULATOR_VERSION_MIN=${IOS_SIMULATOR_VERSION_MIN-"6.0.0"} export IOS_VERSION_MIN=${IOS_VERSION_MIN-"6.0.0"} +else + export IOS_SIMULATOR_VERSION_MIN=${IOS_SIMULATOR_VERSION_MIN-"5.1.1"} + export IOS_VERSION_MIN=${IOS_VERSION_MIN-"5.1.1"} fi -rm -f conftest.c mkdir -p $SIMULATOR32_PREFIX $SIMULATOR64_PREFIX $IOS32_PREFIX $IOS64_PREFIX || exit 1