Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index dbfbf9f01284b3eba80c2ac8a359948a708595b3..b8bb7cbc25117a38a29444f6d3294809b5db4fec 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1223,8 +1223,6 @@ |
# TODO(rnk): Combine with tsan config to share the builder. |
# http://crbug.com/108155 |
['build_for_tool=="drmemory"', { |
- # DrMemory can't handle the debug CRT dll, so build static. |
- 'component': 'static_library', |
# These runtime checks force initialization of stack vars which blocks |
# DrMemory's uninit detection. |
'win_debug_RuntimeChecks': '0', |
@@ -1233,6 +1231,9 @@ |
# Try to disable optimizations that mess up stacks in a release build. |
'win_release_InlineFunctionExpansion': '0', |
'win_release_OmitFramePointers': '0', |
+ # Ditto for debug, to support bumping win_debug_Optimization. |
+ 'win_debug_InlineFunctionExpansion': 0, |
+ 'win_debug_OmitFramePointers': 0, |
# Keep the code under #ifndef NVALGRIND. |
'release_valgrind_build': 1, |
}], |