Merge revision 991 changes:

- Mac: Remove temporary workaround for an Xcode 4 build error.

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1364@993 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-01-15 22:46:40 +00:00
parent 269694e027
commit 7bd42e39ac

View File

@ -19,15 +19,6 @@
}],
]
}, 'conditions': [
['OS=="mac" and clang==1', {
'target_defaults': {
'xcode_settings': {
# Temporary workaround for an Xcode 4 build error. This can be
# removed with the next Chromium update. See crbug.com/156530.
'WARNING_CFLAGS': ['-Wno-unknown-warning-option'],
},
},
}],
['os_posix==1 and OS!="mac" and OS!="android"', {
'target_defaults': {
'cflags_cc': ['-Wno-deprecated-declarations'],