diff options
| -rw-r--r-- | base/allocator/allocator.gyp | 1 | ||||
| -rw-r--r-- | base/base.gyp | 20 |
2 files changed, 15 insertions, 6 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index f669298..42084a8 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -12,6 +12,7 @@ { 'target_name': 'allocator', 'type': 'static_library', + 'toolsets': ['host', 'target'], # Make sure the allocation library is optimized to # the hilt in official builds. 'variables': { diff --git a/base/base.gyp b/base/base.gyp index 4102004..eebab2b 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -50,6 +50,13 @@ ], }, }], + # From debug/leak_annotations.h. + [ 'linux_use_tcmalloc==1', { + 'dependencies': [ + 'allocator/allocator.gyp:allocator', + ], + }, + ], ['toolkit_uses_gtk==1', { 'dependencies': [ '../build/linux/system.gyp:gtk', @@ -658,12 +665,6 @@ 'file_version_info_unittest.cc', ], 'conditions': [ - [ 'linux_use_tcmalloc==1', { - 'dependencies': [ - 'allocator/allocator.gyp:allocator', - ], - }, - ], [ 'toolkit_uses_gtk==1', { 'sources': [ 'nix/xdg_util_unittest.cc', @@ -672,6 +673,13 @@ '../build/linux/system.gyp:gtk', ] }], + # From process_util_unittest.cc. + [ 'linux_use_tcmalloc==1', { + 'dependencies': [ + 'allocator/allocator.gyp:allocator', + ], + }, + ], ], 'dependencies': [ '../build/linux/system.gyp:glib', |