diff options
author | Adam Cozzette <acozzette@gmail.com> | 2018-05-31 11:28:11 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-31 11:28:11 -0700 |
commit | 7e199b9e3501c2a34eeb28fd7eecde46086ad65f (patch) | |
tree | 81aaf41a7e97c9c5baa08adb578d4cf88dc43636 | |
parent | a239ed2bda4b246c10c9d0d2a11a1f7bb1f52c86 (diff) | |
parent | 39d2f703b8c9ea58163e38f711a0c6c2d6b49c7c (diff) | |
download | protobuf-7e199b9e3501c2a34eeb28fd7eecde46086ad65f.tar.gz protobuf-7e199b9e3501c2a34eeb28fd7eecde46086ad65f.tar.bz2 protobuf-7e199b9e3501c2a34eeb28fd7eecde46086ad65f.zip |
Merge pull request #4706 from acozzette/cxx-11
Require C++11 and pass -std=c++11
-rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 08f98d3b..aec10cfa 100644 --- a/configure.ac +++ b/configure.ac @@ -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 # for debugging and which might hurt performance. Most users are probably # 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]) ],[ @@ -207,7 +207,7 @@ case "$target_os" in esac 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, # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock |