Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3449)

Unified Diff: build/common.gypi

Issue 159566: linux: refactor some common flags in common.gypi (Closed)
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index edcd4e4d10949075d74ef1f212bdd9f1dbf38c33..cc3d2329ee0caeb9f1899809d3ccf8650c21784f 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',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698