Skip to content

P
protobuf
Unverified Commit 7e199b9e authored by Adam Cozzette's avatar Adam Cozzette Committed by GitHub
Browse files
Options

Merge pull request #4706 from acozzette/cxx-11 

Require C++11 and pass -std=c++11
parents a239ed2b 39d2f703
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
configure.ac
View file @ 7e199b9e
...@@ -88,7 +88,7 @@ AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],[ ...@@ -88,7 +88,7 @@ AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],[
# Protocol Buffers contains several checks that are intended to be used only # Protocol Buffers contains several checks that are intended to be used only
# for debugging and which might hurt performance. Most users are probably # for debugging and which might hurt performance. Most users are probably
# end users who don't want these checks, so add -DNDEBUG by default. # end users who don't want these checks, so add -DNDEBUG by default.
CXXFLAGS="$CXXFLAGS -DNDEBUG" CXXFLAGS="$CXXFLAGS -std=c++11 -DNDEBUG"
AC_MSG_RESULT([use default: $PROTOBUF_OPT_FLAG $CXXFLAGS]) AC_MSG_RESULT([use default: $PROTOBUF_OPT_FLAG $CXXFLAGS])
],[ ],[
...@@ -207,7 +207,7 @@ case "$target_os" in ...@@ -207,7 +207,7 @@ case "$target_os" in
esac esac
AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1]) AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
AX_CXX_COMPILE_STDCXX([11], [noext], [optional]) AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment