| Index: runtime/bin/bin.gypi
|
| diff --git a/runtime/bin/bin.gypi b/runtime/bin/bin.gypi
|
| index 650f587393e852bcdcfcd7dab0bcb74035489f4f..f460a08169cbfec7be9f5ff15154a5054b923e7e 100644
|
| --- a/runtime/bin/bin.gypi
|
| +++ b/runtime/bin/bin.gypi
|
| @@ -1147,7 +1147,7 @@
|
| },
|
| },
|
| }],
|
| - ['OS == "linux" and asan == 0', {
|
| + ['OS == "linux" and asan == 0 and msan == 0', {
|
| 'dependencies': [
|
| '../third_party/tcmalloc/tcmalloc.gypi:tcmalloc',
|
| ],
|
| @@ -1398,7 +1398,7 @@
|
| 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ],
|
| },
|
| }],
|
| - ['OS == "linux" and asan == 0', {
|
| + ['OS == "linux" and asan == 0 and msan == 0', {
|
| 'dependencies': [
|
| '../third_party/tcmalloc/tcmalloc.gypi:tcmalloc',
|
| ],
|
|
|