Repository: mesos Updated Branches: refs/heads/master 451102c6c -> 6e7a29124
Added back GTEST_USE_OWN_TR1_TUPLE for libprocess. Review: https://reviews.apache.org/r/18866 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c3cfdd57 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c3cfdd57 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c3cfdd57 Branch: refs/heads/master Commit: c3cfdd57f80c8bed05a2e4af014ebbc79f8b6996 Parents: 451102c Author: Dominic Hamon <[email protected]> Authored: Thu Mar 6 17:36:25 2014 -0800 Committer: Benjamin Hindman <[email protected]> Committed: Thu Mar 6 17:36:25 2014 -0800 ---------------------------------------------------------------------- 3rdparty/libprocess/configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c3cfdd57/3rdparty/libprocess/configure.ac ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/configure.ac b/3rdparty/libprocess/configure.ac index 88aeaad..f4e0bcb 100644 --- a/3rdparty/libprocess/configure.ac +++ b/3rdparty/libprocess/configure.ac @@ -161,6 +161,12 @@ if test "x$with_cxx11" = "xyes"; then ;; esac + # Force gtest to use it's own tuple implementation since 'tr1/tuple' + # might not exist (for example, if building with clang). + # TODO(dhamon): Update to gmock 1.7 and pass GTEST_LANG_CXX11 when in + # c++11 mode. + CXXFLAGS="-DGTEST_USE_OWN_TR1_TUPLE=1 $CXXFLAGS" + # Also pass the flags to 3rdparty libraries. CONFIGURE_ARGS="$CONFIGURE_ARGS CXXFLAGS='$CXXFLAGS'" fi
