diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-29 00:52:24 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-29 00:52:24 +0000 |
| commit | 8a2fcba0c72a3af7d8f6e417f5ce2658bb8fbe57 (patch) | |
| tree | d5dccb50b84100735c41526fa5e2a4368d839d90 /build | |
| parent | c02dfbe65e85cb693004573e009902696128d378 (diff) | |
| download | chromium_src-8a2fcba0c72a3af7d8f6e417f5ce2658bb8fbe57.zip chromium_src-8a2fcba0c72a3af7d8f6e417f5ce2658bb8fbe57.tar.gz chromium_src-8a2fcba0c72a3af7d8f6e417f5ce2658bb8fbe57.tar.bz2 | |
linux: refactor some common flags in common.gypi
No functional change, just reducing some cruft.
Review URL: http://codereview.chromium.org/159566
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21933 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/build/common.gypi b/build/common.gypi index edcd4e4..cc3d232 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -242,6 +242,11 @@ 'cflags': [ '<(werror)', # See note above about the werror variable. '-pthread', + '-fno-exceptions', + '-Wall', + ], + 'cflags_cc': [ + '-fno-threadsafe-statics', ], 'ldflags': [ '-pthread', @@ -355,15 +360,7 @@ }, }, 'conditions': [ - [ 'target_arch=="arm"', { - 'cflags': [ - '-fno-exceptions', - '-Wall', - ], - 'cflags_cc': [ - '-fno-threadsafe-statics', - ], - }, { # else: target_arch != "arm" + [ 'target_arch!="arm"', { 'asflags': [ # Needed so that libs with .s files (e.g. libicudata.a) # are compatible with the general 32-bit-ness. @@ -405,11 +402,6 @@ ], 'cflags': [ '-m32', - '-fno-exceptions', - '-Wall', - ], - 'cflags_cc': [ - '-fno-threadsafe-statics', ], 'ldflags': [ '-m32', |