Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: source/libvpx/build/make/configure.sh

Issue 1339513003: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/libvpx/build/make/Makefile ('k') | source/libvpx/configure » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/build/make/configure.sh
diff --git a/source/libvpx/build/make/configure.sh b/source/libvpx/build/make/configure.sh
index 907b47318de1301e32048da5626e515dea33786e..12b994963ca340d124058e6fcf81a746d5e6bb9d 100755
--- a/source/libvpx/build/make/configure.sh
+++ b/source/libvpx/build/make/configure.sh
@@ -428,7 +428,7 @@ NM=${NM}
CFLAGS = ${CFLAGS}
CXXFLAGS = ${CXXFLAGS}
-ARFLAGS = -rus\$(if \$(quiet),c,v)
+ARFLAGS = -crs\$(if \$(quiet),,v)
LDFLAGS = ${LDFLAGS}
ASFLAGS = ${ASFLAGS}
extralibs = ${extralibs}
@@ -728,13 +728,6 @@ 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
@@ -810,14 +803,7 @@ process_common_toolchain() {
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
@@ -1081,7 +1067,9 @@ EOF
CROSS=${CROSS:-g}
;;
os2)
+ disable_feature pic
AS=${AS:-nasm}
+ add_ldflags -Zhigh-mem
;;
esac
« no previous file with comments | « source/libvpx/build/make/Makefile ('k') | source/libvpx/configure » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698