diff options
| author | Johann Koenig <johannkoenig@google.com> | 2018-05-21 16:24:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-21 16:24:13 +0000 |
| commit | c26c07328fab9a8ed3a6a31d54a6a1bac00fc928 (patch) | |
| tree | 34fce97cbafab5dfbfd69acf1ab3ce51574f0f84 | |
| parent | e27a331778c4c99ec37262ea786a3b4cc2a491ac (diff) | |
| parent | 48a3df87c0cced325f1bf95c72c8ac0f8392f919 (diff) | |
| download | libvpx-c26c07328fab9a8ed3a6a31d54a6a1bac00fc928.tar libvpx-c26c07328fab9a8ed3a6a31d54a6a1bac00fc928.tar.gz libvpx-c26c07328fab9a8ed3a6a31d54a6a1bac00fc928.tar.bz2 libvpx-c26c07328fab9a8ed3a6a31d54a6a1bac00fc928.zip | |
Merge "configure,ios: add missing c++11 checks"
| -rw-r--r-- | build/make/configure.sh | 2 | ||||
| -rwxr-xr-x | build/make/iosbuild.sh | 2 | ||||
| -rwxr-xr-x | configure | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index f1d0e34c3..480b2d0ea 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -832,7 +832,7 @@ process_common_toolchain() { IOS_VERSION_MIN="8.0" else IOS_VERSION_OPTIONS="" - IOS_VERSION_MIN="6.0" + IOS_VERSION_MIN="7.0" fi # Handle darwin variants. Newer SDKs allow targeting older diff --git a/build/make/iosbuild.sh b/build/make/iosbuild.sh index e102442bd..2442a282d 100755 --- a/build/make/iosbuild.sh +++ b/build/make/iosbuild.sh @@ -351,7 +351,7 @@ if [ "$ENABLE_SHARED" = "yes" ]; then IOS_VERSION_MIN="8.0" else IOS_VERSION_OPTIONS="" - IOS_VERSION_MIN="6.0" + IOS_VERSION_MIN="7.0" fi if [ "${VERBOSE}" = "yes" ]; then @@ -704,7 +704,7 @@ process_toolchain() { soft_enable libyuv ;; *-android-*) - soft_enable webm_io + check_add_cxxflags -std=c++11 && soft_enable webm_io soft_enable libyuv # GTestLog must be modified to use Android logging utilities. ;; @@ -713,7 +713,7 @@ process_toolchain() { # x86 targets. ;; *-iphonesimulator-*) - soft_enable webm_io + check_add_cxxflags -std=c++11 && soft_enable webm_io soft_enable libyuv ;; *-win*) |