Fixes in preparation for next Chromium roll.

Review URL: https://webrtc-codereview.appspot.com/743004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2668 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-08-27 20:58:56 +00:00
parent 6b84b613d5
commit 36d0baf208
12 changed files with 10 additions and 31 deletions
--- a/third_party/google-gflags/google-gflags.gyp
+++ b/third_party/google-gflags/google-gflags.gyp
@@ -56,9 +56,12 @@
            'src/windows/port.cc',
          ],
        }],
-        ['OS=="mac" and clang==1', {
+        # TODO(andrew): Look into fixing this warning upstream:
+        # http://code.google.com/p/webrtc/issues/detail?id=760
+        ['clang==1', {
+          'cflags!': ['-Wheader-hygiene',],
          'xcode_settings': {
-            'WARNING_CFLAGS!': ['-Wheader-hygiene'],
+            'WARNING_CFLAGS!': ['-Wheader-hygiene',],
          },
        }],
      ],