aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-07 20:28:16 +0000
committerGravatar humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-07 20:28:16 +0000
commitfe0d680bcca66fe412327246a030bf8bdd2f585c (patch)
tree9b787a19f8159512ccea44adef6e1b9dd2b7d6cc /gyp
parent070dcd8ad37a4c5b8a9015938409b27bb3ce3ab9 (diff)
disable werror on 64 bit
BUG= Review URL: https://codereview.appspot.com/7057057 git-svn-id: http://skia.googlecode.com/svn/trunk@7066 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
-rw-r--r--gyp/common_conditions.gypi4
1 files changed, 3 insertions, 1 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index c15ee47f1f..a14be7680b 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -181,6 +181,9 @@
['skia_arch_width == 32', {
'xcode_settings': {
'ARCHS': 'i386',
+ 'OTHER_CPLUSPLUSFLAGS': [
+ '-Werror',
+ ],
},
}],
],
@@ -222,7 +225,6 @@
'GCC_WARN_UNUSED_VALUE': 'YES',
'GCC_WARN_UNUSED_VARIABLE': 'YES',
'OTHER_CPLUSPLUSFLAGS': [
- '-Werror',
'-mssse3',
'-fvisibility=hidden',
'-fvisibility-inlines-hidden',