diff options
| author | mostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 09:08:36 +0000 |
|---|---|---|
| committer | mostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 09:08:36 +0000 |
| commit | 7dcabe659e74031b26cc7cb050d64593bb46677b (patch) | |
| tree | 95f455f69f6e09173d9f95e48bc9ea2b30edc28d | |
| parent | 034fbf874d8f5cfd948e9b46c137b9308503fecf (diff) | |
| download | chromium_src-7dcabe659e74031b26cc7cb050d64593bb46677b.zip chromium_src-7dcabe659e74031b26cc7cb050d64593bb46677b.tar.gz chromium_src-7dcabe659e74031b26cc7cb050d64593bb46677b.tar.bz2 | |
linux: tcmalloc does not depend on glib
This seems to have been an old implicit assumption that use_glib==1 meant OS=="linux".
Review URL: https://chromiumcodereview.appspot.com/17076009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207370 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/base.gyp | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/base/base.gyp b/base/base.gyp index e35e6b1..731bbf9 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': { @@ -726,12 +728,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', @@ -756,6 +752,12 @@ 'message_loop/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. |