summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2018-12-06 22:34:14 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-12-06 22:34:14 +0000
commit4fa9f733f58214b3f338cee7c852485229230b5f (patch)
tree06e5b2277e9cd04d70b4b5af2b656e42f1d0c1e2 /configure
parentc40224631ad20d41f73fc78576dc770169004346 (diff)
parent9c8ae2de7b6b37951ad3e75651784dcf02b1e0cb (diff)
downloadlibvpx-4fa9f733f58214b3f338cee7c852485229230b5f.tar
libvpx-4fa9f733f58214b3f338cee7c852485229230b5f.tar.gz
libvpx-4fa9f733f58214b3f338cee7c852485229230b5f.tar.bz2
libvpx-4fa9f733f58214b3f338cee7c852485229230b5f.zip
Merge "configure: test -std=c++11 before enabling unit tests"
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 4 insertions, 7 deletions
diff --git a/configure b/configure
index ee9b3afc4..9e349636d 100755
--- a/configure
+++ b/configure
@@ -722,18 +722,15 @@ process_toolchain() {
# 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_cxx "$@" <<EOF && soft_enable unit_tests
-int z;
-EOF
- check_add_cxxflags -std=c++11 && soft_enable webm_io
+ check_add_cxxflags -std=c++11 && soft_enable unit_tests \
+ && soft_enable webm_io
check_cxx "$@" <<EOF && soft_enable libyuv
int z;
EOF
;;
*)
- enabled pthread_h && check_cxx "$@" <<EOF && soft_enable unit_tests
-int z;
-EOF
+ enabled pthread_h && check_add_cxxflags -std=c++11 \
+ && soft_enable unit_tests
check_add_cxxflags -std=c++11 && soft_enable webm_io
check_cxx "$@" <<EOF && soft_enable libyuv
int z;