summaryrefslogtreecommitdiffstats
path: root/build
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 /build
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 'build')
-rw-r--r--build/common.gypi14
1 files changed, 9 insertions, 5 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 5196242..4f6513c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1672,6 +1672,9 @@
}],
],
},
+ 'defines': [
+ '_FILE_OFFSET_BITS=64',
+ ],
'cflags': [
'<(werror)', # See note above about the werror variable.
'-pthread',
@@ -1684,7 +1687,6 @@
'-Wno-unused-parameter',
# Don't warn about the "struct foo f = {0};" initialization pattern.
'-Wno-missing-field-initializers',
- '-D_FILE_OFFSET_BITS=64',
# Don't export any symbols (for example, to plugins we dlopen()).
# Note: this is *required* to make some plugins work.
'-fvisibility=hidden',
@@ -1946,10 +1948,12 @@
'-march=armv5te',
'-mtune=xscale',
'-msoft-float',
- '-D__ARM_ARCH_5__',
- '-D__ARM_ARCH_5T__',
- '-D__ARM_ARCH_5E__',
- '-D__ARM_ARCH_5TE__',
+ ],
+ 'defines': [
+ '__ARM_ARCH_5__',
+ '__ARM_ARCH_5T__',
+ '__ARM_ARCH_5E__',
+ '__ARM_ARCH_5TE__',
],
}],
],