diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 00:31:08 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 00:31:08 +0000 |
| commit | 61a9b2d8a766f0eb9e790385939589797bac37f2 (patch) | |
| tree | 5d96266683dc64fc6b37e6839f4ed909a9922db7 /base/base.gypi | |
| parent | 00d721c144d35882dfaf24b3869e95a8d6404ee5 (diff) | |
| download | chromium_src-61a9b2d8a766f0eb9e790385939589797bac37f2.zip chromium_src-61a9b2d8a766f0eb9e790385939589797bac37f2.tar.gz chromium_src-61a9b2d8a766f0eb9e790385939589797bac37f2.tar.bz2 | |
Merge the LINUX_TC_MALLOC #define with the existing TC_MALLOC #define.
BUG=36687
TEST=about:tcmalloc, etc, works when tcmalloc is enabled on Linux.
Review URL: http://codereview.chromium.org/660118
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
| -rw-r--r-- | base/base.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/base.gypi b/base/base.gypi index 1d4b3e0..3948fe4 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -366,13 +366,13 @@ 'sources/': [ ['include', '_chromeos\\.cc$'] ] }, ], - [ 'linux_use_tcmalloc==1', { + [ 'linux_use_tcmalloc==0', { 'defines': [ - 'LINUX_USE_TCMALLOC', + 'NO_TCMALLOC', ], 'direct_dependent_settings': { 'defines': [ - 'LINUX_USE_TCMALLOC', + 'NO_TCMALLOC', ], }, }, |