diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-29 21:24:56 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-29 21:24:56 +0000 |
| commit | bb05e45ae19103b8baece7c6d513ba2aa67fd422 (patch) | |
| tree | 0c3bf42f47adf5cf1506b2e8765e283d6d6d0c38 /third_party/tcmalloc | |
| parent | a1640051f4c4abcc7c7de1b224e696284f1fbc57 (diff) | |
| download | chromium_src-bb05e45ae19103b8baece7c6d513ba2aa67fd422.zip chromium_src-bb05e45ae19103b8baece7c6d513ba2aa67fd422.tar.gz chromium_src-bb05e45ae19103b8baece7c6d513ba2aa67fd422.tar.bz2 | |
Taking advantage of new configuration inheritance option.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/342041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30515 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc')
| -rw-r--r-- | third_party/tcmalloc/tcmalloc.gyp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp index 0e6a934..fbb2750 100644 --- a/third_party/tcmalloc/tcmalloc.gyp +++ b/third_party/tcmalloc/tcmalloc.gyp @@ -16,21 +16,7 @@ ], 'direct_dependent_settings': { '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': { + 'Common': { 'msvs_settings': { 'VCLinkerTool': { 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'], |