shithub: libvpx

Info  •  Files  •  Log  •  Branches

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

--- a/build/make/configure.sh

+++ b/build/make/configure.sh

@@ -728,6 +728,13 @@

   # 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 @@

           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