commit aa370ec7ba6fbc59c8f700837a436a02a2aacb35
author Jeff Kaufman <jefftk@google.com> Thu Oct 13 21:42:54 2016 -0400
committer Jeff Kaufman <jefftk@google.com> Thu Oct 13 21:42:54 2016 -0400
tree 1e23089656a0d5710a48c723e2b55d3925ba95dc
parent 87fc3e5e5e2c77854b2d8eeecd75692cb8982865
parent ad41e72a83569af75ec3bcd1ad6bc1e638a4475f

Merge remote-tracking branch 'origin/trunk-tracking' into jefftk-better-error-message

config

diff --git a/config b/config
index ceedb3d..d08c047 100644
--- a/config
+++ b/config
@@ -105,7 +105,8 @@
 # to our libpsol.a
 # See https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
 CFLAGS="$CFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
-CC_TEST_FLAGS="$CC_TEST_FLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
+CC_OLD_TEST_FLAGS="$CC_TEST_FLAGS"
+CC_TEST_FLAGS="$CC_TEST_FLAGS -D_GLIBCXX_USE_CXX11_ABI=0 --std=c++11"
 
 case "$NGX_GCC_VER" in
   4.8*)
@@ -360,3 +361,5 @@
 fi
 
 have=NGX_PAGESPEED . auto/have
+
+CC_TEST_FLAGS="$CC_OLD_TEST_FLAGS"