diff options
| author | thakis <thakis@chromium.org> | 2015-10-23 10:59:17 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-23 18:00:42 +0000 |
| commit | 469f0e325c36f278a9849051265f65cc2dcf804a (patch) | |
| tree | d70cf4100c9efa0ba00205dd1345aa7394ea6f0a /build/common.gypi | |
| parent | 34fc1adb8866eae31d330c2983de17896bc1c1e2 (diff) | |
| download | chromium_src-469f0e325c36f278a9849051265f65cc2dcf804a.zip chromium_src-469f0e325c36f278a9849051265f65cc2dcf804a.tar.gz chromium_src-469f0e325c36f278a9849051265f65cc2dcf804a.tar.bz2 | |
iOS: Use a 10.7 deployment target for host builds.
The internal iOS build used to use libstdc++, but after
https://codereview.chromium.org/1334273004/ force libc+++ on for iOS the
internal bots broke because they use Xcode's clang and Xcode's clang
complains if -stdlib=libc++ is passed and the deployment target is not at
least 10.7.
As a fix, set the mac deployment target for iOS host compiles to 10.7, and
suppress warnings about deprecated functions for iOS host compiles. (The
warnings can't be fixed until the deployment target is increased on Mac too;
this is covered by crbug.com/547071)
BUG=535104,400091
Review URL: https://codereview.chromium.org/1426433002
Cr-Commit-Position: refs/heads/master@{#355822}
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 34010bb..e7b0527 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"', { |