Skip to content

Commit

Permalink
Merge pull request #110 from mapbox/1ec5-min-sdk-1707
Browse files Browse the repository at this point in the history
Hard-code minimum iOS SDK version
  • Loading branch information
1ec5 committed Aug 5, 2015
2 parents 1d5789d + f403285 commit d8597d9
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions mason.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ elif [ ${MASON_PLATFORM} = 'ios' ]; then

MASON_SDK_ROOT=${MASON_XCODE_ROOT}/Platforms/iPhoneOS.platform/Developer
MASON_SDK_PATH="${MASON_SDK_ROOT}/SDKs/iPhoneOS${MASON_PLATFORM_VERSION}.sdk"
export MASON_IOS_CFLAGS="-miphoneos-version-min=${MASON_PLATFORM_VERSION} -isysroot ${MASON_SDK_PATH} -arch armv7 -arch armv7s -arch arm64"
MIN_SDK_VERSION_FLAG="-miphoneos-version-min=7.0"
export MASON_IOS_CFLAGS="${MIN_SDK_VERSION_FLAG} -isysroot ${MASON_SDK_PATH} -arch armv7 -arch armv7s -arch arm64"
if [[ ${MASON_PLATFORM_VERSION%%.*} -ge 9 ]]; then
export MASON_IOS_CFLAGS="${MASON_IOS_CFLAGS} -fembed-bitcode"
fi
Expand All @@ -75,7 +76,7 @@ elif [ ${MASON_PLATFORM} = 'ios' ]; then

MASON_SDK_ROOT=${MASON_XCODE_ROOT}/Platforms/iPhoneSimulator.platform/Developer
MASON_SDK_PATH="${MASON_SDK_ROOT}/SDKs/iPhoneSimulator${MASON_PLATFORM_VERSION}.sdk"
export MASON_ISIM_CFLAGS="-miphoneos-version-min=${MASON_PLATFORM_VERSION} -isysroot ${MASON_SDK_PATH} -arch i386 -arch x86_64"
export MASON_ISIM_CFLAGS="${MIN_SDK_VERSION_FLAG} -isysroot ${MASON_SDK_PATH} -arch i386 -arch x86_64"

elif [ ${MASON_PLATFORM} = 'linux' ]; then

Expand Down

0 comments on commit d8597d9

Please sign in to comment.