ref: 4fa9f733f58214b3f338cee7c852485229230b5f
parent: c40224631ad20d41f73fc78576dc770169004346
parent: 9c8ae2de7b6b37951ad3e75651784dcf02b1e0cb
author: James Zern <[email protected]>
date: Thu Dec 6 17:34:14 EST 2018
Merge "configure: test -std=c++11 before enabling unit tests"
--- a/configure
+++ b/configure
@@ -722,18 +722,15 @@
# 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;