Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(803)

Unified Diff: third_party/tcmalloc/tcmalloc.gyp

Issue 173387: Linux: add gyp flag for enabling tcmalloc. (Closed)
Patch Set: Disable tc_mallinfo since it breaks windows. Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/tcmalloc/google/tcmalloc.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/tcmalloc/tcmalloc.gyp
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp
index b6d07f33472fc16d3e8e35386b1c6cb5f9d98bde..86aad51f26e277114bbbe27d94280d9c1a7c103a 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',
+ ],
+ },
],
},
],
- },
+ }],
],
}
« no previous file with comments | « third_party/tcmalloc/google/tcmalloc.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698