diff options
| author |  humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 19:02:46 +0000 |
|---|---|---|
| committer | humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 19:02:46 +0000 |
| commit | af2bd7bdf593b3fc91bb1acffcc4a51bdb2f29ec (patch) | |
| tree | 504f1707d5d5888c529d11952d439700be72b957 /gyp | |
| parent | 9c4e5ac5b7d32151d4d8ab1fb7ed443b35eb1254 (diff) | |
hopefully fix gyp mistake for iOS
BUG=
Review URL: https://codereview.appspot.com/7065052
git-svn-id: http://skia.googlecode.com/svn/trunk@7058 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/utils.gyp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gyp/utils.gyp b/gyp/utils.gyp index 8d87d15116..c76bb7ebc0 100644 --- a/gyp/utils.gyp +++ b/gyp/utils.gyp @@ -211,11 +211,6 @@ '../src/utils/cityhash', '../third_party/externals/cityhash/src', ], - 'xcode_settings': { - 'OTHER_CPLUSPLUSFLAGS!': [ - '-Werror', - ] - }, 'sources': [ '../third_party/externals/cityhash/src/city.cc', ], @@ -224,6 +219,15 @@ '../third_party/externals/cityhash/src', ], }, + 'conditions': [ + [ 'skia_os == "mac"', { + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS!': [ + '-Werror', + ] + }, + }], + ], }, ], } |