ref: 46df71396df5a079a7195f9bc85399e83cd57cfd
parent: 7555e2b8225e9387e30288cd4eb5b26414badf14
parent: 78637b61361ab11425afd4a67d43c4df948647a6
author: Tom Finegan <tomfinegan@chromium.org>
date: Tue Jun 23 18:57:03 EDT 2015
Merge "Fix building with iOS 9 beta SDK"
--- 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