diff options
Diffstat (limited to 'source/libvpx/build/make/configure.sh')
| -rwxr-xr-x | source/libvpx/build/make/configure.sh | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/source/libvpx/build/make/configure.sh b/source/libvpx/build/make/configure.sh index ab6687f..56e9f44 100755 --- a/source/libvpx/build/make/configure.sh +++ b/source/libvpx/build/make/configure.sh @@ -736,6 +736,9 @@ process_common_toolchain() { # PIC is probably what we want when building shared libs enabled shared && soft_enable pic + # Minimum iOS version for all target platforms (darwin and iphonesimulator). + IOS_VERSION_MIN="6.0" + # Handle darwin variants. Newer SDKs allow targeting older # platforms, so find the newest SDK available. case ${toolchain} in @@ -788,8 +791,8 @@ process_common_toolchain() { add_ldflags "-mmacosx-version-min=10.9" ;; *-iphonesimulator-*) - add_cflags "-miphoneos-version-min=5.0" - add_ldflags "-miphoneos-version-min=5.0" + add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}" + add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}" osx_sdk_dir="$(xcrun --sdk iphonesimulator --show-sdk-path)" add_cflags "-isysroot ${osx_sdk_dir}" add_ldflags "-isysroot ${osx_sdk_dir}" @@ -970,18 +973,28 @@ EOF ;; darwin*) - XCRUN_FIND="xcrun --sdk iphoneos -find" CXX="$(${XCRUN_FIND} clang++)" CC="$(${XCRUN_FIND} clang)" AR="$(${XCRUN_FIND} ar)" - LD="$(${XCRUN_FIND} ld)" AS="$(${XCRUN_FIND} as)" STRIP="$(${XCRUN_FIND} strip)" NM="$(${XCRUN_FIND} nm)" RANLIB="$(${XCRUN_FIND} ranlib)" AS_SFX=.s + # Special handling of ld for armv6 because libclang_rt.ios.a does + # not contain armv6 support in Apple's clang package: + # Apple LLVM version 5.1 (clang-503.0.40) (based on LLVM 3.4svn). + # TODO(tomfinegan): Remove this. Our minimum iOS version (6.0) + # renders support for armv6 unnecessary because the 3GS and up + # support neon. + if [ "${tgt_isa}" = "armv6" ]; then + LD="$(${XCRUN_FIND} ld)" + else + LD="${CXX:-$(${XCRUN_FIND} ld)}" + fi + # ASFLAGS is written here instead of using check_add_asflags # because we need to overwrite all of ASFLAGS and purge the # options that were put in above @@ -989,7 +1002,13 @@ EOF alt_libc="$(xcrun --sdk iphoneos --show-sdk-path)" add_cflags -arch ${tgt_isa} -isysroot ${alt_libc} - add_ldflags -arch ${tgt_isa} -ios_version_min 7.0 + add_ldflags -arch ${tgt_isa} + + if [ "${LD}" = "${CXX}" ]; then + add_ldflags -miphoneos-version-min="${IOS_VERSION_MIN}" + else + add_ldflags -ios_version_min "${IOS_VERSION_MIN}" + fi for d in lib usr/lib usr/lib/system; do try_dir="${alt_libc}/${d}" |