diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-04 22:50:13 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-04 22:50:13 +0000 |
| commit | f926fa0abe81397721ee6bc89b88025139a47cbf (patch) | |
| tree | 11857d0a444d14434a7e3ee8526a9ddc38fd753b /third_party | |
| parent | 7b60e5868d392022dd601bbb396acb9c86781271 (diff) | |
| download | chromium_src-f926fa0abe81397721ee6bc89b88025139a47cbf.zip chromium_src-f926fa0abe81397721ee6bc89b88025139a47cbf.tar.gz chromium_src-f926fa0abe81397721ee6bc89b88025139a47cbf.tar.bz2 | |
Adding two new windows configuration types:
Purify
Release - no tcmalloc
This is done more pedantically than I'd like,
so I've left in some TODOs. Eventually either gyp needs to support some
notion of inheritance in configurations, or maybe we can make clever use
of includes.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/159362
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/tcmalloc/tcmalloc.gyp | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp index 43fc60d..41e7664 100644 --- a/third_party/tcmalloc/tcmalloc.gyp +++ b/third_party/tcmalloc/tcmalloc.gyp @@ -21,12 +21,30 @@ 'tcmalloc/src', ], 'direct_dependent_settings': { - 'msvs_settings': { - 'VCLinkerTool': { - 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'], - 'AdditionalDependencies': [ - '<(SHARED_INTERMEDIATE_DIR)/tcmalloc/libcmt.lib' - ], + 'configurations': { + # TODO(bradnelson): find a way to make this more graceful in gyp. + # Ideally configurations should be able to have some sort of + # inheritance hierarchy. So that Purify no-tcmalloc could be + # be derived from Release. + 'Debug': { + 'msvs_settings': { + 'VCLinkerTool': { + 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'], + 'AdditionalDependencies': [ + '<(SHARED_INTERMEDIATE_DIR)/tcmalloc/libcmt.lib' + ], + }, + }, + }, + 'Release': { + 'msvs_settings': { + 'VCLinkerTool': { + 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'], + 'AdditionalDependencies': [ + '<(SHARED_INTERMEDIATE_DIR)/tcmalloc/libcmt.lib' + ], + }, + }, }, }, }, |