Index: base/base.gyp |
diff --git a/base/base.gyp b/base/base.gyp |
index fa4b00e1b318dafc4cd45de47811195522193c93..145423d047cf2c7ef2001564411f95142eacddab 100644 |
--- a/base/base.gyp |
+++ b/base/base.gyp |
@@ -40,16 +40,6 @@ |
['chromeos==1', { |
'sources/': [ ['include', '_chromeos\\.cc$'] ] |
}], |
- ['linux_use_tcmalloc==0', { |
- 'defines': [ |
- 'NO_TCMALLOC', |
- ], |
- 'direct_dependent_settings': { |
- 'defines': [ |
- 'NO_TCMALLOC', |
- ], |
- }, |
- }], |
['toolkit_uses_gtk==1', { |
'dependencies': [ |
'../build/linux/system.gyp:gtk', |
@@ -187,6 +177,18 @@ |
'-ldl', |
], |
}, |
+ 'conditions': [ |
+ ['linux_use_tcmalloc==0', { |
+ 'defines': [ |
+ 'NO_TCMALLOC', |
+ ], |
+ 'direct_dependent_settings': { |
+ 'defines': [ |
+ 'NO_TCMALLOC', |
+ ], |
+ }, |
+ }], |
+ ], |
}], |
['OS == "mac" or (OS == "ios" and _toolset == "host")', { |
'link_settings': { |
@@ -724,12 +726,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', |
@@ -754,6 +750,12 @@ |
'message_pump_glib_unittest.cc', |
] |
}], |
+ ['OS == "linux" and linux_use_tcmalloc==1', { |
+ 'dependencies': [ |
+ 'allocator/allocator.gyp:allocator', |
+ ], |
+ }, |
+ ], |
['OS == "win"', { |
# This is needed to trigger the dll copy step on windows. |
# TODO(mark): This should not be necessary. |