commit af2bd7bdf593b3fc91bb1acffcc4a51bdb2f29ec
author humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jan 07 19:02:46 2013 +0000
committer humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jan 07 19:02:46 2013 +0000
tree 504f1707d5d5888c529d11952d439700be72b957
parent 9c4e5ac5b7d32151d4d8ab1fb7ed443b35eb1254

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

gyp/utils.gyp

diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 8d87d15..c76bb7e 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',
+            ]
+          },
+        }],
+      ],
     },
   ],
 }