diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-02-14 02:59:12 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-02-14 02:59:12 +0100 |
| commit | d66cba2b93f9f91b87d380b23b8f571d10ab2bb6 (patch) | |
| tree | ba1fbd1bbb69d761b60ebab2deabceacbb306563 /templates/Makefile.template | |
| parent | 44cdd6ec1af7bb761274ded521dbc14dc8721157 (diff) | |
Properly msan-instrumenting protobuf and our C++ tests - but gflags isn't instrumented yet.
Diffstat (limited to 'templates/Makefile.template')
| -rw-r--r-- | templates/Makefile.template | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index b9ae217054..992b906932 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -83,13 +83,13 @@ DEFINES_asan = NDEBUG 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 |