ref: 8fa5ca48999f67998c7a5f805dc27dc54b22e53d
parent: f5617fd0834f0ca2a8e27428f1a3543fc09029c5
parent: d8808d365e656710e6769ce8c70579bf7897dcdb
author: Tom Finegan <[email protected]>
date: Wed Sep 9 21:36:29 EDT 2015
Merge "Revert "Fix building with iOS 9 beta SDK""
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -728,13 +728,6 @@
# 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@@ -810,14 +803,7 @@
if disabled neon && enabled neon_asm; then
die "Disabling neon while keeping neon-asm is not supported"
fi
- 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
+ soft_enable media
;;
armv6)
soft_enable media