Skip to content

Commit 6e7a291

Browse files
Dominic Hamonbenh
Dominic Hamon
authored andcommitted
Added back GTEST_USE_OWN_TR1_TUPLE for Mesos.
Review: https://reviews.apache.org/r/18867
1 parent c3cfdd5 commit 6e7a291

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

configure.ac

+5
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,11 @@ if test "x$with_cxx11" = "xyes"; then
624624
;;
625625
esac
626626

627+
# Force gtest to use it's own tuple implementation since 'tr1/tuple'
628+
# might not exist (for example, if building with clang).
629+
# TODO(dhamon): Upgrade gmock to 1.7 and pass GTEST_LANG_CXX11.
630+
CXXFLAGS="-DGTEST_USE_OWN_TR1_TUPLE=1 $CXXFLAGS"
631+
627632
# Also pass the flags to 3rdparty libraries.
628633
CONFIGURE_ARGS="$CONFIGURE_ARGS CXXFLAGS='$CXXFLAGS'"
629634
fi

0 commit comments

Comments
 (0)