diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 21:53:46 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 21:53:46 +0000 |
| commit | b7b0676f1b0e629de25e588e3b6f380f3bd5bce8 (patch) | |
| tree | 1dcd91e8417560cd692d11334469bea1609a0bd2 /third_party/tcmalloc/tcmalloc.gyp | |
| parent | adff370d2ca91093b1a7b1a14e32bde2fc88dd73 (diff) | |
| download | chromium_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 'third_party/tcmalloc/tcmalloc.gyp')
| -rw-r--r-- | third_party/tcmalloc/tcmalloc.gyp | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp index b6d07f3..86aad51 100644 --- a/third_party/tcmalloc/tcmalloc.gyp +++ b/third_party/tcmalloc/tcmalloc.gyp @@ -235,25 +235,31 @@ }], ], }, - { - 'target_name': 'libcmt', - 'type': 'none', - 'actions': [ + ], + 'conditions': [ + ['OS=="win"', { + 'targets': [ { - 'action_name': 'libcmt', - 'inputs': [ - 'prep_libc.sh', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/tcmalloc/libcmt.lib', - ], - 'action': [ - './prep_libc.sh', - '$(VCInstallDir)lib', - '<(SHARED_INTERMEDIATE_DIR)/tcmalloc', + 'target_name': 'libcmt', + 'type': 'none', + 'actions': [ + { + 'action_name': 'libcmt', + 'inputs': [ + 'prep_libc.sh', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/tcmalloc/libcmt.lib', + ], + 'action': [ + './prep_libc.sh', + '$(VCInstallDir)lib', + '<(SHARED_INTERMEDIATE_DIR)/tcmalloc', + ], + }, ], }, ], - }, + }], ], } |