summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 21:53:46 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 21:53:46 +0000
commitb7b0676f1b0e629de25e588e3b6f380f3bd5bce8 (patch)
tree1dcd91e8417560cd692d11334469bea1609a0bd2 /base/base.gyp
parentadff370d2ca91093b1a7b1a14e32bde2fc88dd73 (diff)
downloadchromium_src-b7b0676f1b0e629de25e588e3b6f380f3bd5bce8.zip
chromium_src-b7b0676f1b0e629de25e588e3b6f380f3bd5bce8.tar.gz
chromium_src-b7b0676f1b0e629de25e588e3b6f380f3bd5bce8.tar.bz2
Linux: add gyp flag for enabling tcmalloc. Also fix the linux build which didn't work in a clean client since tcmalloc.h wasn't generated.
Review URL: http://codereview.chromium.org/173387 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp9
1 files changed, 9 insertions, 0 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 7be1225..bf6d9d2 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -365,6 +365,9 @@
],
'conditions': [
[ 'OS == "linux"', {
+ 'variables' : {
+ 'linux_use_tcmalloc%': 0,
+ },
'sources/': [ ['exclude', '_(mac|win|chromeos)\\.cc$'],
['exclude', '\\.mm?$' ] ],
'sources!': [
@@ -378,6 +381,12 @@
'sources/': [ ['include', '_chromeos\\.cc$'] ]
},
],
+ [ 'linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+ ],
+ },
+ ],
],
'dependencies': [
'../build/util/build_util.gyp:lastchange',