Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 28e3389b76fe724be78b51b54f52bc61a5c1b274..71cb1089c6ea6380c66f2cd0529b9e9c3020b4d7 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -4194,6 +4194,13 @@ |
'-fcolor-diagnostics', |
], |
}], |
+ # TODO(rohitrao): This flag is temporary and should be removed as |
+ # soon as the iOS bots are updated to use Xcode 5.1. |
+ ['OS=="ios" and ("<(GENERATOR)"=="xcode" or clang_xcode==1)', { |
rohitrao (ping after 24h)
2014/03/11 20:43:24
This conditions clause works if I put it here, but
|
+ 'WARNING_CFLAGS': [ |
+ '-Wno-unknown-warning-option', |
+ ], |
+ }], |
], |
}, |
'conditions': [ |
@@ -4463,6 +4470,9 @@ |
'-Wno-unneeded-internal-declaration', |
# Match OS X clang C++11 warning settings. |
'-Wno-c++11-narrowing', |
+ # As of Xcode 5.1, the register keyword is deprecated, but Chromium |
+ # code still uses it. |
+ '-Wno-deprecated-register', |
], |
rohitrao (ping after 24h)
2014/03/11 20:43:24
If I put the following code here, the flag gets ig
Mark Mentovai
2014/03/11 20:46:38
rohitrao wrote:
|
# Limit the valid architectures depending on "target_subarch". |