summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Jiang <jianj@google.com>2021-03-03 17:33:30 -0800
committerJerome Jiang <jianj@google.com>2021-03-04 11:16:06 -0800
commitf7c386bab0e637dff65c3fe546a83e9564028aff (patch)
tree51f0ae3c97d3aff11cd5096e335a5876eead0627
parentebefb90b75f07ea5ab06d6b2a5ea5355c843d266 (diff)
downloadlibvpx-f7c386bab0e637dff65c3fe546a83e9564028aff.tar.gz
Use -std=gnu++11 instead of -std=c++11
Cygwin and msys2 have stricter compliance requirement over standard c headers. Bug: webm:1708 Change-Id: I676b1227b9dd304149e50016468df0f057c6a78f
-rwxr-xr-xconfigure12
-rw-r--r--examples/vpx_dec_fuzzer.cc2
-rw-r--r--third_party/libwebm/Android.mk2
3 files changed, 8 insertions, 8 deletions
diff --git a/configure b/configure
index f7e11aaf2..da631a45e 100755
--- a/configure
+++ b/configure
@@ -731,33 +731,33 @@ process_toolchain() {
soft_enable libyuv
;;
*-android-*)
- check_add_cxxflags -std=c++11 && soft_enable webm_io
+ check_add_cxxflags -std=gnu++11 && soft_enable webm_io
soft_enable libyuv
# GTestLog must be modified to use Android logging utilities.
;;
*-darwin-*)
- check_add_cxxflags -std=c++11
+ check_add_cxxflags -std=gnu++11
# iOS/ARM builds do not work with gtest. This does not match
# x86 targets.
;;
*-iphonesimulator-*)
- check_add_cxxflags -std=c++11 && soft_enable webm_io
+ check_add_cxxflags -std=gnu++11 && soft_enable webm_io
soft_enable libyuv
;;
*-win*)
# Some mingw toolchains don't have pthread available by default.
# Treat these more like visual studio where threading in gtest
# would be disabled for the same reason.
- check_add_cxxflags -std=c++11 && soft_enable unit_tests \
+ check_add_cxxflags -std=gnu++11 && soft_enable unit_tests \
&& soft_enable webm_io
check_cxx "$@" <<EOF && soft_enable libyuv
int z;
EOF
;;
*)
- enabled pthread_h && check_add_cxxflags -std=c++11 \
+ enabled pthread_h && check_add_cxxflags -std=gnu++11 \
&& soft_enable unit_tests
- check_add_cxxflags -std=c++11 && soft_enable webm_io
+ check_add_cxxflags -std=gnu++11 && soft_enable webm_io
check_cxx "$@" <<EOF && soft_enable libyuv
int z;
EOF
diff --git a/examples/vpx_dec_fuzzer.cc b/examples/vpx_dec_fuzzer.cc
index 34c0e1123..5eba9d74d 100644
--- a/examples/vpx_dec_fuzzer.cc
+++ b/examples/vpx_dec_fuzzer.cc
@@ -41,7 +41,7 @@
$make -j32
* Build vp9 fuzzer
- $ $CXX $CXXFLAGS -std=c++11 -DDECODER=vp9 \
+ $ $CXX $CXXFLAGS -std=gnu++11 -DDECODER=vp9 \
-fsanitize=fuzzer -I../libvpx -I. -Wl,--start-group \
../libvpx/examples/vpx_dec_fuzzer.cc -o ./vpx_dec_fuzzer_vp9 \
./libvpx.a -Wl,--end-group
diff --git a/third_party/libwebm/Android.mk b/third_party/libwebm/Android.mk
index b46ba101d..3b3dd1d39 100644
--- a/third_party/libwebm/Android.mk
+++ b/third_party/libwebm/Android.mk
@@ -3,7 +3,7 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE:= libwebm
LOCAL_CPPFLAGS:=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
-LOCAL_CPPFLAGS+=-D__STDC_LIMIT_MACROS -std=c++11
+LOCAL_CPPFLAGS+=-D__STDC_LIMIT_MACROS -std=gnu++11
LOCAL_C_INCLUDES:= $(LOCAL_PATH)
LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)