ref: d8808d365e656710e6769ce8c70579bf7897dcdb
parent: 536a90970b7b7d0bf4a029ae1a61774088dc795a
author: Tom Finegan <[email protected]>
date: Wed Sep 9 01:25:55 EDT 2015
Revert "Fix building with iOS 9 beta SDK" This reverts commit 78637b61361ab11425afd4a67d43c4df948647a6. Breaks armv7-darwin targets with current SDK (iOS 8/Xcode 6.4). BUG=https://code.google.com/p/webm/issues/detail?id=1062 Change-Id: I58b27950f330557154d681a894114eadfbd3e593
--- 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