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

2016-10-13 21:42:54 -04:00
parent 87fc3e5e5e ad41e72a83
commit aa370ec7ba
1 changed files with 4 additions and 1 deletions
@@ -105,7 +105,8 @@ CFLAGS="$CFLAGS $FLAG_MARCH"
 # 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 @@ END
 fi

 have=NGX_PAGESPEED . auto/have
+
+CC_TEST_FLAGS="$CC_OLD_TEST_FLAGS"