Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index cede6f187720f60150cd632e9a4458f1258b3014..4e671833488d6ebb537aa516f9f8f7a8550a3772 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -943,7 +943,58 @@ |
# third_party/asan may be different from the default one. |
'clang_use_chrome_plugins%': 0, |
}], |
+ |
+ # On valgrind bots, override the optimizer settings so we don't inline too |
+ # much and make the stacks harder to figure out. Use the same settings |
+ # on all buildbot masters to make it easier to move bots. |
+ # |
+ # TODO(rnk): Kill off variables that no one else uses and just implement |
+ # them under a build_for_tool== condition. |
+ ['build_for_tool=="memcheck" or build_for_tool=="tsan"', { |
+ # gcc flags |
+ 'mac_debug_optimization': '1', |
+ 'mac_release_optimization': '1', |
+ 'release_optimize': '1', |
+ 'no_gc_sections': 1, |
+ 'debug_extra_cflags': |
+ '-g -fno-inline -fno-omit-frame-pointer -fno-builtin -fno-optimize-sibling-calls', |
Marc-Antoine Ruel (Google)
2012/02/29 00:03:41
style nit: you can split it up in 80 cols with pyt
Reid Kleckner
2012/02/29 20:20:16
GYP is parsed with Python syntax rules and not JSO
|
+ 'release_extra_cflags': |
+ '-g -fno-inline -fno-omit-frame-pointer -fno-builtin -fno-optimize-sibling-calls', |
+ |
+ # MSVS flags |
Timur Iskhodzhanov
2012/02/29 09:14:18
# MSVS flags for TSan/Win
Reid Kleckner
2012/02/29 20:20:16
Done.
|
+ 'win_debug_RuntimeChecks': '0', |
+ 'win_debug_disable_iterator_debugging': '1', |
+ 'win_debug_Optimization': '1', |
+ 'win_debug_InlineFunctionExpansion': '0', |
+ 'win_release_InlineFunctionExpansion': '0', |
+ 'win_release_OmitFramePointers': '0', |
+ |
+ 'linux_use_tcmalloc': 1, |
+ 'release_valgrind_build': 1, |
+ 'werror': '', |
+ 'component': 'static_library', |
+ 'use_system_zlib': 0, |
+ }], |
+ |
+ # TODO(timurrrr): Investigate http://crbug.com/108155 . It would be nice |
Timur Iskhodzhanov
2012/02/29 09:14:18
maybe you should move the comment a few lines down
Reid Kleckner
2012/02/29 20:20:16
I think of the comment as referring to the separat
|
+ # if we could use the same flags as tsan to share a builder, but /O1 |
+ # breaks our callstacks. |
+ ['build_for_tool=="drmemory"', { |
+ 'win_debug_RuntimeChecks': '0', |
+ 'win_debug_disable_iterator_debugging': '1', |
+ # 'win_debug_Optimization=1 ' |
+ # 'win_debug_InlineFunctionExpansion=0 ' |
+ # 'win_debug_OmitFramePointers=0 ' |
+ |
+ 'win_release_InlineFunctionExpansion': '0', |
+ 'win_release_OmitFramePointers': '0', |
+ # Keep the code under #ifndef NVALGRIND. |
+ 'release_valgrind_build': 1, |
+ # DrMemory can't handle debug CRT dll, so build static. |
+ 'component': 'static_library', |
+ }], |
], |
+ |
# List of default apps to install in new profiles. The first list contains |
# the source files as found in svn. The second list, used only for linux, |
# contains the destination location for each of the files. When a crx |