summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-10 05:57:12 +0000
committerbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-10 05:57:12 +0000
commit4f18b677bf07e0d6e92bccc07e96854fa245ea17 (patch)
treec00796311e1d4ab5ee60af966fab1ae6a5c786af /third_party
parent2c93d189c2d2100b8745a3ba19d6f49c6868a868 (diff)
downloadchromium_src-4f18b677bf07e0d6e92bccc07e96854fa245ea17.zip
chromium_src-4f18b677bf07e0d6e92bccc07e96854fa245ea17.tar.gz
chromium_src-4f18b677bf07e0d6e92bccc07e96854fa245ea17.tar.bz2
Pulling in new gyp version with 'none' type workaround.
Review URL: http://codereview.chromium.org/149447 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/tcmalloc/tcmalloc.gyp8
1 files changed, 7 insertions, 1 deletions
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp
index 43fc60d..ddef91f 100644
--- a/third_party/tcmalloc/tcmalloc.gyp
+++ b/third_party/tcmalloc/tcmalloc.gyp
@@ -75,7 +75,13 @@
},
{
'target_name': 'libcmt',
- 'type': 'none',
+ 'conditions': [
+ ['OS=="win"', {
+ 'type': 'utility',
+ },{
+ 'type': 'none',
+ }],
+ ],
'actions': [
{
'action_name': 'libcmt',