diff options
| author | Brion Vibber <bvibber@wikimedia.org> | 2015-06-20 12:08:35 -0700 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2015-06-22 12:09:09 -0700 |
| commit | 78637b61361ab11425afd4a67d43c4df948647a6 (patch) | |
| tree | c5735f2b3d49bcae0c292d7b49608d1cfc5a9055 | |
| parent | 8e029fcfa9dbb017b190645b04a3cd5838abaf71 (diff) | |
| download | libvpx-78637b61361ab11425afd4a67d43c4df948647a6.tar libvpx-78637b61361ab11425afd4a67d43c4df948647a6.tar.gz libvpx-78637b61361ab11425afd4a67d43c4df948647a6.tar.bz2 libvpx-78637b61361ab11425afd4a67d43c4df948647a6.zip | |
Fix building with iOS 9 beta SDK
configure.sh was setting some Mac OS X options for iOS targets, which
confuses the iOS 9 beta SDK in Xcode 7 when linking libraries.
Additionally, old armv6 media extensions were being enabled on iOS
when they're not needed (we always have Neon since iOS 6). These
broke on iOS 9 SDK which no longer assembles those instructions.
Change-Id: I4e4d2722392ead3382ce96289c03ef1e489799d6
| -rw-r--r-- | build/make/configure.sh | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index c5bed61be..688fa12c5 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -728,6 +728,13 @@ process_common_toolchain() { # Handle darwin variants. Newer SDKs allow targeting older # platforms, so use the newest one available. case ${toolchain} in + arm*-darwin*) + ios_sdk_dir="$(show_darwin_sdk_path iphoneos)" + if [ -d "${ios_sdk_dir}" ]; then + add_cflags "-isysroot ${ios_sdk_dir}" + add_ldflags "-isysroot ${ios_sdk_dir}" + fi + ;; *-darwin*) osx_sdk_dir="$(show_darwin_sdk_path macosx)" if [ -d "${osx_sdk_dir}" ]; then @@ -803,7 +810,14 @@ process_common_toolchain() { if disabled neon && enabled neon_asm; then die "Disabling neon while keeping neon-asm is not supported" fi - soft_enable media + case ${toolchain} in + *-darwin*) + # Neon is guaranteed on iOS 6+ devices, while old media extensions + # no longer assemble with iOS 9 SDK + ;; + *) + soft_enable media + esac ;; armv6) soft_enable media |