aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2014-10-07 09:54:18 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-10-07 09:54:18 -0700
commit38ba4e0588bc01dedbe8b14cf990a6f4ffe92fc7 (patch)
treee3a2b5899e890e5f31c177a2eb22bb366093163e /gyp
parentfb1fe4f51820731f557e765f8c71cba9a0d28048 (diff)
Add -Wno-invalid-offsetof to Mac and iOS builds too.
We use this on Linux already, but for whatever reason wasn't a problem on iOS until using it in SkPaint. Mac 10.7 and 10.8 are showing this warning too, but seems -Werror is not enabled. CQ_EXTRA_TRYBOTS=tryserver.skia:Build-Mac10.7-Clang-Arm7-Release-iOS-Trybot BUG=skia: Review URL: https://codereview.chromium.org/637593002
Diffstat (limited to 'gyp')
-rw-r--r--gyp/common_conditions.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index ca5c98c4d4..4d06ffcc14 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -509,6 +509,7 @@
'WARNING_CFLAGS': [
'-Wall',
'-Wextra',
+ '-Wno-invalid-offsetof',
'-Wno-unused-parameter',
'-Wno-uninitialized', # Disabled because we think GCC 4.2 is bad at this.
],
@@ -551,6 +552,7 @@
'SDKROOT': 'iphoneos',
'TARGETED_DEVICE_FAMILY': '1,2',
'OTHER_CPLUSPLUSFLAGS': [
+ '-Wno-invalid-offsetof',
'-fvisibility=hidden',
'-fvisibility-inlines-hidden',
],