summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-25 17:51:36 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-25 17:51:36 +0000
commit6863896f0ebd9018104efbfac39ba0fde7c3703a (patch)
treea72dd0f0d5a2e2fb7105b59c5651de0ef729ea69 /base
parentd18e5031f989c3d6df6d899b925a0c0a6a9712ff (diff)
downloadchromium_src-6863896f0ebd9018104efbfac39ba0fde7c3703a.zip
chromium_src-6863896f0ebd9018104efbfac39ba0fde7c3703a.tar.gz
chromium_src-6863896f0ebd9018104efbfac39ba0fde7c3703a.tar.bz2
Use a 'defines' block instead of adding -Dfoo to cflags.
Should be equivalent, but simpler. Review URL: http://codereview.chromium.org/9235021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/allocator/allocator.gyp14
1 files changed, 8 insertions, 6 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index d10fd49..b72f6f7 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -367,8 +367,8 @@
# so only one of them should be used.
'<(tcmalloc_dir)/src/tcmalloc.cc',
],
- 'cflags': [
- '-DTCMALLOC_FOR_DEBUGALLOCATION',
+ 'defines': [
+ 'TCMALLOC_FOR_DEBUGALLOCATION',
],
}, { # linux_use_debugallocation != 1
'sources!': [
@@ -383,7 +383,9 @@
],
'cflags': [
'-finstrument-functions',
- '-DKEEP_SHADOW_STACKS',
+ ],
+ 'defines': [
+ 'KEEP_SHADOW_STACKS',
],
}],
[ 'linux_use_heapchecker==0', {
@@ -393,8 +395,8 @@
'<(tcmalloc_dir)/src/heap-checker.cc',
],
# Disable the heap checker in tcmalloc.
- 'cflags': [
- '-DNO_HEAP_CHECK',
+ 'defines': [
+ 'NO_HEAP_CHECK',
],
}],
],