Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index e7dc6170c65224e50ad30471968433c0cf10f690..87d0eb3bc82e22a3e85219b3af5fdad35526a285 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1928,13 +1928,17 @@ |
'conditions': [ |
['OS=="ios"', { |
'mac_sdk_min%': '10.8', |
+ # The iOS build can use Xcode's clang, and that will complain |
+ # about -stdlib=libc++ if the deployment target is not at least |
+ # 10.7. |
+ 'mac_deployment_target%': '10.7', |
}, { # else OS!="ios" |
'mac_sdk_min%': '10.10', |
+ 'mac_deployment_target%': '10.6', |
}], |
], |
'mac_sdk_path%': '', |
- 'mac_deployment_target%': '10.6', |
}, |
'mac_sdk_min': '<(mac_sdk_min)', |
@@ -5448,6 +5452,17 @@ |
'ARCHS': [ |
'x86_64', |
], |
+ 'WARNING_CFLAGS': [ |
+ # TODO(thakis): Remove this once the deployment target on OS X |
+ # is 10.7 too, http://crbug.com/547071 |
+ # In general, it is NOT OK to add -Wno-deprecated-declarations |
+ # anywhere, you should instead fix your code instead. But host |
+ # compiles on iOS are really mac compiles, so this will be fixed |
+ # when the mac deployment target is increased. (Some of the |
+ # fixes depend on OS X 10.7 so they can't be done before mac |
+ # upgrades). |
+ '-Wno-deprecated-declarations', |
+ ], |
}, |
}], |
['_toolset=="target"', { |