commit d66cba2b93f9f91b87d380b23b8f571d10ab2bb6
author Nicolas "Pixel" Noble <pixel@nobis-crew.org> Sat Feb 14 02:59:12 2015 +0100
committer Nicolas "Pixel" Noble <pixel@nobis-crew.org> Sat Feb 14 02:59:12 2015 +0100
tree ba1fbd1bbb69d761b60ebab2deabceacbb306563
parent 44cdd6ec1af7bb761274ded521dbc14dc8721157

Properly msan-instrumenting protobuf and our C++ tests - but gflags isn't instrumented yet.

Makefile

diff --git a/Makefile b/Makefile
index fe0f703..c7f7e93 100644
--- a/Makefile
+++ b/Makefile
@@ -66,13 +66,13 @@
 VALID_CONFIG_msan = 1
 REQUIRE_CUSTOM_LIBRARIES_msan = 1
 CC_msan = clang
-CXX_msan = clang++
+CXX_msan = clang++-libc++
 LD_msan = clang
-LDXX_msan = clang++
-CPPFLAGS_msan = -O1 -fsanitize=memory -fno-omit-frame-pointer
+LDXX_msan = clang++-libc++
+CPPFLAGS_msan = -O1 -fsanitize=memory -fno-omit-frame-pointer -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1
 OPENSSL_CFLAGS_msan = -DPURIFY
 OPENSSL_CONFIG_msan = no-asm
-LDFLAGS_msan = -fsanitize=memory
+LDFLAGS_msan = -fsanitize=memory -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1
 DEFINES_msan = NDEBUG
 
 VALID_CONFIG_ubsan = 1